fixed the orientation, fixed the collision detection