bug fix and color changes