Grammar bug fixes

Got down to 5 shift/reduce conflicts (3 need to be fixed for sure, the other two are dangling if/else ambiguity)