add metadata, misc changes