speed up the importer by ~x100 and improve the CLI usability