some fixes in text and color