more work on generic ingest; some fixes to the main method and drivers