Fix dupes and alphabetize