Fix sprites
Refactoring collision detection