update to fix Mobius problems: correct factors of r^2 Psi^4 and z2 term