fixes to data importing