small improvements to importer