Some changes to matrixmult