Add more tables, tidy up