Improved text handling.