rename psi to joint_feature, minor cleanups