Update color and vector class
Clean up various stuff