updated line wrapping stuff