Bugfixes

YAML is inherently unordered.  This makes things complicated.