Further Tweaks

Changes to tons of stuff