cleaning up CMP kinematics a little