Fixed Collision detection and movement