fixed some tokenizer bugs