- Handle 2-word glommed matching
- Revisit gap detection
- Handle transposition properly