Final 1.0 Tweaks