fix moving + collisions