adding full data sets, some minor ui work