table2 enabled tips, more code cleanup