fixed/made better the `move_toward` stuff