Collision detection closer to what was intended. Still problems when moving up and left/right.