incorporated table fixes from main branch