Fixing more of the collision detection