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