push player controller and collider

updated calculations