Alphabetize better, remove bad entries.