bug fix and color change