Somewhat fixed movement bugs