Tweaked movement code for better useability