fixing some issues with the color system, and some cleanup