Updating invalid YAML
Improve compilation
Further updates to Detectors
New country detectors