Assorted tweaks

A few things I have changed along the way while using this. You can check out the individual commits for details.