Grammar updates, as well as code example changes