fixing up data tables