Add Matrix2, Matrix3, and a few improvments

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>