Docs patches from Jeffrey
Merge/pull cleanup