added hyphens and equals to grammar affixes