More cosmetic changes and 1 typo.