resolved ambiguities in the grammer definition