completely fix movement stuff