various fixes (using jison generated files now)