add parser and bug fix of tokenizer