finalize grammar rework