matcher enhancements + evaluation