- reorder tokens
- fix errors when calling tokenize second time
- tests