fixes for movement