cherry-pick adding metadata to listings + minor fixes