fix color and bug