improve comments on nonterminal definitions
add 0-or-1 quantifier nonterminal