Fixed a few issues with format of tables, etc.