fix text color, fix bug