Spellcheck and minor cleanup