Fix rotation and collisions