Various minor edits.