Created NumbersForMatrix and some more minor tweaks