re-organized movement fixed glitches