Did some work on Matrix. Minor edits to vectors.

Still WIP, though.