small fixes in the grammar