fixes for the metadata and replaced expand by expandfull