Add in comments, tweak matrix class