BUG-FUCKING-FIXES

Collisions work :D