collision detection improvements