Data Import Improvements

- fixup a couple of issues with the data importer