Code cleanup
Fixed to use eigenVectors the right way round
Sped up the p_z calc