Final edits for this round.

Edits here and there.