fixed? some movement issues