Add YAML support

And fix a long-running bug with blank fields