Docs and minor tweaks.
Screwed up merging, sigh.