Fix the saturation controls added

Make saturation and value work a little more naturally plus
a somewhat simpler enable mechanism
More tweaks