multiple fixes to table 2