new color model, some cleanup