phi_lam changed to psi_lam (consistent w/ derivations), and other minor changes
Authored by: kyonten 2004-10-24
Parent: [r957]
Child: [r959]