movement bug fix

refixed it to be less hack-ish