Fix augmented grammar and update grammar description