fixes to ebnfParser