Tweaks

Lots of Gooderness!