Add fixDates; clean up parsers.