Fixing movement and other stuff