added word-wrap, comments