Cosmetics and typo fixes.