a number of small SimilarityMap fixes/changes