Metadata: metadata tweak and updates (zoggy)