Fixed a few things, added matrices.