Correct pillar usage
Fix YAML errors
Corrado's fix