Added some TODOs to matrix.ml.