more closure on uploads, metadata fix