Finished 2.1 and made computeK independent of matrix form