Lots of minor edits.