fixed up grammar, still get conflicts, but the lookahead should take care of those