tokenizer improved