Updates to matching and PyViewer