more edits from Mark's comments