finally fixed the tokenizer