table, some fixes