Fix spelling errors, and such.
Merge from master...