fix movement bugs