text handling improved