Minor fixes
Correct and simplify word-wrapping