more collision detection

so many freaking collisions