fix line wrapping, plus some edits from Ian's feedback