Normalize numbers before formatting
Simplify country spec
Minor comment fix
Fix a big rookie mistake in loading YAML files

Duh.