Final fixes and typo changes.