vastly improved matcher output #3