Tweaked movement code a bit