Cleaned up a few problems with the matrix class and got rid of the label feature.