refactored collision
collision tweaks