minor updates to parser bnf; instaparse is mind numbing!!