Separating functions for computing/rendering matches, bugfixing - #381.