Documentation pass.
Merging Andy's doc changes.