Fixed the tables (hopefully!)