Increased TimeScale + Minor Tweaks