Fix to wrong movement and the other stuff.