some changes to RigidBodyController stuff after recent testing