unchecked edits
edits following comments by SM
edit corrections following comments by SM