more tokenizer fixes