Changed some in collisionmanager and added(not finished) a method in collision