Misc. Table Bug Fixes and cleanup