Spelling, assorted cleanup.