add strings to the grammar
fix mismatched naming
grammar additions were incomplete