fixed some coloring bugs