2 bug fixes for movement