Small improvements, mostly to documentation.
Merge pull request #1183 from sjcorbett/misc-improvements

Small improvements, mostly to documentation.