Add missing chars to the 'tokenizer'

Add a todo as well.