add missing grammars and adjust associativity
snapshot