Various cleanups and copy edits.