SOme updates to Matrix class.