updating for colors and some other fixes