bug fixes in importer