Addressing some Matrix2 TODOs
Merge pull request #606 from twitter/somematrix2todos

Address some of the Matrix2 TODOs