Improved line-wrap capabilities