major bug fixes in color change