...
Version in to_xml fix
More asserts
Cleanup
More metadata 1.1 fields [tmp]