Changed signature of MakeMatrix().
Fixed wrong row count on Diag().