DOC-672: edits from technical review
DOC-672: more edits from tech review