colors and other fixes