fix bugs in movement
fix bugs in movement