Fixed a few typos. Merged two people.