Collision detection improvements