Collision detection fixes

woot