added parabolic jumping and better collision detection