Cleanups & Fixes

Please excuse the ton of commits, I tend to prefer small targeted commits, though I did squash as many together as made sense. Good thing is that it makes it easy to find any bugs with bisect and commits are cheap as hell.

Most of this stuff is trivial, some less trivial; seems pretty stable here.

If you'd prefer close this PR for now until the release is out no problem with me, all of it is easy to keep up to date until ready to pull.