tokenizer improvments