fixed up movement bugs from prev commit, need to polish it some more still