Tokenizer bugs fixed