Some cosmetics and typos.

Feel free to ask more info about my changes.