More proper nouns and formatting fixes