table fixes and co