Table modifications to fix bugs. Closes #390 #391

Little table modifications to fix bugs and some design details. fixes #390, #391