Output 80-char-wide friendly

some edits ... here and there.