movement bug fixes not compelete