Fixed init errors, added token overlap detection

It turns out I had some token overlap I hadn't noticed... maybe it's time to at
least implement a Maximal Munch tokenizer!