improved lexer helps parser doing the job