change color
fix bugs