Various documentation tweaks.
Merge.