fixed color and other stuff