A few more improvement to text