Changes to color function and other things