Wrap settings: dont break words
Merge cleanup