Filters etc are now alphabetized. Closes #2