final fixes for the parser.