Fixup metadata and add authors