Loads of fiddles

I went through and did some of the reformatting, and made sure that
country now appears in the tables
Merge remote-tracking branch 'origin/master'