small changes to the grammar