Finished correcting psi/phi mixup.