Docs update and some bug fixes

I considered splitting these outs but the patches are all fairly clean, albeit unrelated, so I figured to try my luck with a single pull request first.