table fixes and additions