Tweaks

Tweaking all the things.