movement bug fix

bug fix and bug fix for bug fix