Worked on grammar spec further