change color and minor fix