updates to rigrammar