adding data importer, bug fixes