Implemented damage & improved collisions