Bug fixes incl. test data and improved metadata