major fixes for the importer