changes on parser and tokenizer to improve accuracy