timestamp fix + metadata fix