edits following comments by SM