Now sharing the metadata from quantum correctly, and a little cleanup elsewhere