some fixes to text parts