Alphabetizing and 3 fixes