Temp fix for tables (need to be rebuilt into nice bootstrap tables) and
fix a whole bunch of undefined concatenations and such.