changes for colors, fix some bugs