fixed tokenizer issues