Fixing a few movement bugs