various clean-ups to text and formatting