Fixing tables

Massive re-write of tables to Fixing tables that weren’t correctly
created (insufficient column spans and such). Added code to force all
text commands on the same line.