Updated main and parse.y