Added most expressions to grammar