Additional parsing

more grammer additions.