chores - lots of

See the commits, they pretty much sum it all up.