This commit: Incorporates Miren, Bill suggestions, and my revisions, to Editor round 2 revisions.