Fix typo reported by JesseH, and some other minor edits.