more edits, addressed john's comments