Movement Tweaks and Scaling Fix