Some cosmetics and typos.

Feel free to ask more info on my small changes.