Debugged combparser, minor changes to yacc