Reworked collision code, cleaned up CollisionManager.