Added tokenizeBetween + misc
Lots of dirty hacking. Need to revisit and review.