Small changes with word wrap addition