Kind of alphabetized things. Added some more shortcuts.