data-importer specs, phase-2 + misc clean-ups