Lots of improvements to text