Tighter matches
Support EXISTS
Alphabetize handlers
Alphabetize++
Refactoring and new commands