tightening up some movement mechanics