updated for minor issues in data import and issues with unique indexes; pending import test