Cleaned up tables & added 2 pubs