Small updates on the grammar