Doc fixes and things from the review. (This commit will be squashed before merge).