fixed movement bugs