Fix output dimensions
Add options for outputting individual countries in isolation