fixed collisions, returned movement