Fixed Collision Handling/Detection

Fixed more of the collision detection and handling. Still not perfect,
has a few bugs still, but should be enough for the deliverable.