A few improvement to text