removed single character from rarely used options
correct pattern matching for expansions
optimized trie generation (permuting token separators)