Table bugs fixed