Small fixes to the LL(1) grammar, and a start on a LALR(1) bison grammar as a backup.