master: adding new word-wrap logic, trying to catch disconnects