minor updates to parser bnf