Added some better plotting of matches