bug fixes. added color picker