Update grammar

rules for expr and term have been fixed