Make 'country' optional in the case that the location is a country
Chapter edits, recompile