some minor modifications to the grammars