mjf edits
DOC: Merged MJFs edits.