A few small changes, still working on matrices.