Improved word wrap