Fixing the start symbol naming, adding constructors, fixing mix grammar.