fixed both tokenize and tokenization.