fixing some issues and alphabetizing.