NG. First commit
minor updates
Matrix code cleanup