Make edits and simplifications after feedback from NF board.
MAINT: fix a couple of typos.