fixes to BNF in dox