other small issues in table and other