another round of improvements for mismatches