more metric space and other changes