Review/tweaks

Not really an easy way to give you feedback other than creating a PR.

Each change has its own commit so you should be able to cherrypick what you want.

As it stands I'm not sure much (if anything) will be logged as there are no appenders. Any thoughts on how do deal with that? Have a private fork of this for One Diary and do it there?