string diff now wraps, better output