fixes to EvalSimilarity and macroape introduction