some cosmetic changes
fix some coloring bugs