some more edits, including suggestions from Lindsey