More progress on the grammar