overhaul of data sets and minor changes to Main