Minor edits, from Nick's comments