made some arguments more logical (i.e. changed psi to mode)