fixed tokenizer bugs