working on edits suggested by editor, nearly all done