More coverage

Improves coverage of dates and countries among other things.