Fixed a glitch

Fixed a glitch and did some alphabetizing