Lots of fixes to parser table