Bugfixes in movement