fix a table and minor problems