bugfixes for movement