Fixes to matrixes, checks to results, rewrote results checking