Improvements to Collision Detection

Still kind of weird... but meh.