minor fixes to color picker / small speed improvement