ifs and else stmts added to grammar