table2, db fixes