V0.2 Matrix class cleanup

Did some cleaning up on the matrix class.