Improve the output of the run matcher some more