change colors, fixed small bugs