Tweaks

Not sure how you want to manage changes, figured I'd PR rather than commit to master. Lemme know if you just want me to commit the boring changes.