psi1 is now the right way around
Merge branch 'psi1_transpose_fix' into devel