diff --git a/LatexIndent/Document.pm b/LatexIndent/Document.pm
index 0894295f..41a2cf6e 100644
--- a/LatexIndent/Document.pm
+++ b/LatexIndent/Document.pm
@@ -37,7 +37,7 @@ use LatexIndent::BlankLines qw/protect_blank_lines unprotect_blank_lines condens
 use LatexIndent::ModifyLineBreaks
     qw/modify_line_breaks_body modify_line_breaks_end modify_line_breaks_end_after remove_line_breaks_begin adjust_line_breaks_end_parent verbatim_modify_line_breaks/;
 use LatexIndent::Sentence qw/one_sentence_per_line/;
-use LatexIndent::Wrap qw/text_wrap/;
+use LatexIndent::Wrap qw/text_wrap text_wrap_comment_blocks/;
 use LatexIndent::TrailingComments
     qw/remove_trailing_comments put_trailing_comments_back_in add_comment_symbol construct_trailing_comment_regexp/;
 use LatexIndent::HorizontalWhiteSpace qw/remove_trailing_whitespace remove_leading_space/;
@@ -302,8 +302,9 @@ sub process_body_of_text {
         and ${ $mainSettings{modifyLineBreaks}{oneSentencePerLine} }{manipulateSentences}
         and ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{when} eq 'after' )
     {
-        $logger->trace("*one-sentence-per-line text wrapping routine, textWrapOptions:when set to 'after'") if $is_tt_switch_active;
-        $self->one_sentence_per_line( textWrap => 1);
+        $logger->trace("*one-sentence-per-line text wrapping routine, textWrapOptions:when set to 'after'")
+            if $is_tt_switch_active;
+        $self->one_sentence_per_line( textWrap => 1 );
     }
 
     # option for text wrap
@@ -315,6 +316,12 @@ sub process_body_of_text {
     {
         $self->text_wrap();
     }
+
+    # option for comment text wrap
+    $self->text_wrap_comment_blocks()
+        if ($is_m_switch_active
+        and ${ ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{comments} }{wrap}
+        and ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{when} eq 'after' );
     return;
 }
 
@@ -322,9 +329,10 @@ sub find_objects {
     my $self = shift;
 
     # one sentence per line: sentences are objects, as of V3.5.1
-    $self->one_sentence_per_line( textWrap => (${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{when} eq 'before'))
-        if ($is_m_switch_active
-        and ${ $mainSettings{modifyLineBreaks}{oneSentencePerLine} }{manipulateSentences});
+    $self->one_sentence_per_line(
+        textWrap => ( ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{when} eq 'before' ) )
+        if ( $is_m_switch_active
+        and ${ $mainSettings{modifyLineBreaks}{oneSentencePerLine} }{manipulateSentences} );
 
     # text wrapping
     #
@@ -347,6 +355,12 @@ sub find_objects {
         $self->verbatim_modify_line_breaks( when => "afterTextWrap" );
     }
 
+    # option for comment text wrap
+    $self->text_wrap_comment_blocks()
+        if ($is_m_switch_active
+        and ${ ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{comments} }{wrap}
+        and ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{when} eq 'before' );
+
     # search for environments
     $logger->trace('*looking for ENVIRONMENTS') if $is_t_switch_active;
     $self->find_environments if ${$self}{body} =~ m/$environmentBasicRegExp/s;
diff --git a/LatexIndent/GetYamlSettings.pm b/LatexIndent/GetYamlSettings.pm
index a3617c33..630ef3f3 100644
--- a/LatexIndent/GetYamlSettings.pm
+++ b/LatexIndent/GetYamlSettings.pm
@@ -117,56 +117,73 @@ sub yaml_read_settings {
 
     # we'll need the home directory a lot in what follows
     my $homeDir = File::HomeDir->my_home;
-     $logger->info("*YAML reading settings") unless $switches{onlyDefault};
+    $logger->info("*YAML reading settings") unless $switches{onlyDefault};
 
     my $indentconfig = undef;
-    if (defined $ENV{LATEXINDENT_CONFIG} && !$switches{onlyDefault}) {
-        if(-f $ENV{LATEXINDENT_CONFIG}) {
+    if ( defined $ENV{LATEXINDENT_CONFIG} && !$switches{onlyDefault} ) {
+        if ( -f $ENV{LATEXINDENT_CONFIG} ) {
             $indentconfig = $ENV{LATEXINDENT_CONFIG};
             $logger->info('The $LATEXINDENT_CONFIG variable was detected.');
-            $logger->info('The value of $LATEXINDENT_CONFIG is: "' . $ENV{LATEXINDENT_CONFIG} . '"');
-        } else {
+            $logger->info( 'The value of $LATEXINDENT_CONFIG is: "' . $ENV{LATEXINDENT_CONFIG} . '"' );
+        }
+        else {
             $logger->warn('*The $LATEXINDENT_CONFIG variable is assigned, but does not point to a file!');
-            $logger->warn('The value of $LATEXINDENT_CONFIG is: "' . $ENV{LATEXINDENT_CONFIG} . '"');
+            $logger->warn( 'The value of $LATEXINDENT_CONFIG is: "' . $ENV{LATEXINDENT_CONFIG} . '"' );
         }
     }
-    if (!defined $indentconfig && !$switches{onlyDefault}) {
-        # see all possible values of $^O here: https://perldoc.perl.org/perlport#Unix and https://perldoc.perl.org/perlport#DOS-and-Derivatives
-        if ($^O eq "linux") {
-            if (defined $ENV{XDG_CONFIG_HOME} && -f "$ENV{XDG_CONFIG_HOME}/latexindent/indentconfig.yaml") {
+    if ( !defined $indentconfig && !$switches{onlyDefault} ) {
+
+# see all possible values of $^O here: https://perldoc.perl.org/perlport#Unix and https://perldoc.perl.org/perlport#DOS-and-Derivatives
+        if ( $^O eq "linux" ) {
+            if ( defined $ENV{XDG_CONFIG_HOME} && -f "$ENV{XDG_CONFIG_HOME}/latexindent/indentconfig.yaml" ) {
                 $indentconfig = "$ENV{XDG_CONFIG_HOME}/latexindent/indentconfig.yaml";
-                $logger->info('The $XDG_CONFIG_HOME variable and the config file in "' . "$ENV{XDG_CONFIG_HOME}/latexindent/indentconfig.yaml" . '" were recognized');
-                $logger->info('The value of $XDG_CONFIG_HOME is: "' . $ENV{XDG_CONFIG_HOME} . '"');
-            } elsif (-f "$homeDir/.config/latexindent/indentconfig.yaml") {
+                $logger->info( 'The $XDG_CONFIG_HOME variable and the config file in "'
+                        . "$ENV{XDG_CONFIG_HOME}/latexindent/indentconfig.yaml"
+                        . '" were recognized' );
+                $logger->info( 'The value of $XDG_CONFIG_HOME is: "' . $ENV{XDG_CONFIG_HOME} . '"' );
+            }
+            elsif ( -f "$homeDir/.config/latexindent/indentconfig.yaml" ) {
                 $indentconfig = "$homeDir/.config/latexindent/indentconfig.yaml";
-                $logger->info('The config file in "' . "$homeDir/.config/latexindent/indentconfig.yaml" . '" was recognized');
+                $logger->info(
+                    'The config file in "' . "$homeDir/.config/latexindent/indentconfig.yaml" . '" was recognized' );
             }
-        } elsif ($^O eq "darwin") {
-            if (-f "$homeDir/Library/Preferences/latexindent/indentconfig.yaml")  {
+        }
+        elsif ( $^O eq "darwin" ) {
+            if ( -f "$homeDir/Library/Preferences/latexindent/indentconfig.yaml" ) {
                 $indentconfig = "$homeDir/Library/Preferences/latexindent/indentconfig.yaml";
-                $logger->info('The config file in "' . "$homeDir/Library/Preferences/latexindent/indentconfig.yaml" . '" was recognized');
+                $logger->info( 'The config file in "'
+                        . "$homeDir/Library/Preferences/latexindent/indentconfig.yaml"
+                        . '" was recognized' );
             }
-        } elsif ($^O eq "MSWin32" || $^O eq "cygwin") {
-            if (defined $ENV{LOCALAPPDATA} && -f "$ENV{LOCALAPPDATA}/latexindent/indentconfig.yaml") {
+        }
+        elsif ( $^O eq "MSWin32" || $^O eq "cygwin" ) {
+            if ( defined $ENV{LOCALAPPDATA} && -f "$ENV{LOCALAPPDATA}/latexindent/indentconfig.yaml" ) {
                 $indentconfig = "$ENV{LOCALAPPDATA}/latexindent/indentconfig.yaml";
-                $logger->info('The $LOCALAPPDATA variable and the config file in "' . "$ENV{LOCALAPPDATA}" . '\latexindent\indentconfig.yaml" were recognized');
-                $logger->info('The value of $LOCALAPPDATA is: "' . $ENV{LOCALAPPDATA} . '"');
-            } elsif (-f "$homeDir/AppData/Local/latexindent/indentconfig.yaml") {
+                $logger->info( 'The $LOCALAPPDATA variable and the config file in "'
+                        . "$ENV{LOCALAPPDATA}"
+                        . '\latexindent\indentconfig.yaml" were recognized' );
+                $logger->info( 'The value of $LOCALAPPDATA is: "' . $ENV{LOCALAPPDATA} . '"' );
+            }
+            elsif ( -f "$homeDir/AppData/Local/latexindent/indentconfig.yaml" ) {
                 $indentconfig = "$homeDir/AppData/Local/latexindent/indentconfig.yaml";
-                $logger->info('The config file in "' . "$homeDir" . '\AppData\Local\latexindent\indentconfig.yaml" was recognized');
+                $logger->info( 'The config file in "'
+                        . "$homeDir"
+                        . '\AppData\Local\latexindent\indentconfig.yaml" was recognized' );
             }
         }
+
         # if $indentconfig is still not defined, fallback to the location in $homeDir
         if ( !defined $indentconfig ) {
+
             # if all of these don't exist check home directly, with the non hidden file
-            $indentconfig = (-f "$homeDir/indentconfig.yaml") ? "$homeDir/indentconfig.yaml" : undef;
+            $indentconfig = ( -f "$homeDir/indentconfig.yaml" ) ? "$homeDir/indentconfig.yaml" : undef;
+
             # if indentconfig.yaml doesn't exist, check for the hidden file, .indentconfig.yaml
-            $indentconfig = (-f "$homeDir/.indentconfig.yaml") ? "$homeDir/.indentconfig.yaml" : undef;
-            $logger->info('The config file in "' . "$indentconfig" . '" was recognized') if defined $indentconfig;
+            $indentconfig = ( -f "$homeDir/.indentconfig.yaml" ) ? "$homeDir/.indentconfig.yaml" : undef;
+            $logger->info( 'The config file in "' . "$indentconfig" . '" was recognized' ) if defined $indentconfig;
         }
     }
 
-
     # messages for indentconfig.yaml and/or .indentconfig.yaml
     if ( defined $indentconfig && -f $indentconfig && !$switches{onlyDefault} ) {
 
@@ -219,7 +236,8 @@ sub yaml_read_settings {
     else {
         if ( $switches{onlyDefault} ) {
             $logger->info("*-d switch active: only default settings requested");
-            $logger->info("not reading USER settings from $indentconfig") if ( defined $indentconfig &&  -e $indentconfig );
+            $logger->info("not reading USER settings from $indentconfig")
+                if ( defined $indentconfig && -e $indentconfig );
             $logger->info("Ignoring the -l switch: $switches{readLocalSettings} (you used the -d switch)")
                 if ( $switches{readLocalSettings} );
             $logger->info("Ignoring the -y switch: $switches{yaml} (you used the -d switch)") if ( $switches{yaml} );
@@ -733,9 +751,11 @@ sub yaml_read_settings {
     #           columns: 100
     #           when: after             <!------
     #
-    if ($is_m_switch_active  and ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{when} eq 'after'
-        and ${ $mainSettings{modifyLineBreaks}{oneSentencePerLine} }{sentenceIndent} =~ m/\h+/ ){
-                $logger->warn("*one-sentence-per-line *ignoring* sentenceIndent, as text wrapping set to 'after'");
+    if (    $is_m_switch_active
+        and ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{when} eq 'after'
+        and ${ $mainSettings{modifyLineBreaks}{oneSentencePerLine} }{sentenceIndent} =~ m/\h+/ )
+    {
+        $logger->warn("*one-sentence-per-line *ignoring* sentenceIndent, as text wrapping set to 'after'");
         ${ $mainSettings{modifyLineBreaks}{oneSentencePerLine} }{sentenceIndent} = q();
     }
 
diff --git a/LatexIndent/Sentence.pm b/LatexIndent/Sentence.pm
index e62e1ee5..3447d975 100644
--- a/LatexIndent/Sentence.pm
+++ b/LatexIndent/Sentence.pm
@@ -32,14 +32,14 @@ our @EXPORT_OK = qw/one_sentence_per_line/;
 our $sentenceCounter;
 
 sub one_sentence_per_line {
-    my $self = shift;
+    my $self  = shift;
     my %input = @_;
 
     $logger->trace(
         "*One sentence per line regular expression construction: (see oneSentencePerLine: manipulateSentences)")
         if $is_t_switch_active;
 
-    # 
+    #
     # sentences FOLLOW
     #
     my $sentencesFollow = q();
@@ -106,7 +106,7 @@ sub one_sentence_per_line {
     $logger->trace("Sentences follow regexp:") if $is_tt_switch_active;
     $logger->trace($sentencesFollow) if $is_tt_switch_active;
 
-    # 
+    #
     # sentences BEGIN with
     #
     my $sentencesBeginWith = q();
@@ -275,6 +275,20 @@ sub one_sentence_per_line {
                             $replacementText;
                             /xsge;
 
+    #
+    # remove spaces between trailing comments
+    #
+    #
+    # from:
+    #
+    #   % first comment %second comment
+    #                  ^
+    # into:
+    #
+    #   % first comment%second comment
+    #
+    ${$self}{body} =~ s/($trailingCommentRegExp)\h($trailingCommentRegExp)/$1$2/sg;
+
     if ( ${ $mainSettings{modifyLineBreaks}{oneSentencePerLine} }{sentenceIndent} !~ m/\h+/ ) {
 
         # loop back through the sentenceStorage and replace with the sentence, adjusting line breaks
diff --git a/LatexIndent/TrailingComments.pm b/LatexIndent/TrailingComments.pm
index 4ddfe8eb..71b1027a 100644
--- a/LatexIndent/TrailingComments.pm
+++ b/LatexIndent/TrailingComments.pm
@@ -24,7 +24,7 @@ use LatexIndent::LogFile qw/$logger/;
 use Data::Dumper;
 use Exporter qw/import/;
 our @EXPORT_OK
-    = qw/remove_trailing_comments put_trailing_comments_back_in $trailingCommentRegExp add_comment_symbol construct_trailing_comment_regexp/;
+    = qw/remove_trailing_comments put_trailing_comments_back_in $trailingCommentRegExp add_comment_symbol construct_trailing_comment_regexp @trailingComments/;
 our @trailingComments;
 our $commentCounter = 0;
 our $trailingCommentRegExp;
@@ -39,13 +39,17 @@ sub add_comment_symbol {
 
     # add a trailing comment token after, for example, a square brace [
     # or a curly brace { when, for example, BeginStartsOnOwnLine == 2
-    my $self = shift;
+    my $self  = shift;
+    my %input = @_;
+
+    my $commentValue = ( defined $input{value} ? $input{value} : q() );
 
     # increment the comment counter
     $commentCounter++;
 
     # store the comment -- without this, it won't get processed correctly at the end
-    push( @trailingComments, { id => $tokens{trailingComment} . $commentCounter . $tokens{endOfToken}, value => q() } );
+    push( @trailingComments,
+        { id => $tokens{trailingComment} . $commentCounter . $tokens{endOfToken}, value => $commentValue } );
 
     # log file info
     $logger->trace("*Updating trailing comment array") if $is_t_switch_active;
@@ -145,8 +149,6 @@ sub put_trailing_comments_back_in {
             $logger->trace("Comment not at end of line $trailingcommentID, moving it to end of line")
                 if $is_t_switch_active;
             ${$self}{body} =~ s/%$trailingcommentID(.*)$/$1%$trailingcommentValue/m;
-            #####if(${$self}{body} =~ m/%$trailingcommentID\h*[^%]+?$/mx){
-            #####    $logger->trace("Comment not at end of line $trailingcommentID, moving it to end of line") if $is_t_switch_active;
         }
         else {
             ${$self}{body} =~ s/%$trailingcommentID/%$trailingcommentValue/;
diff --git a/LatexIndent/Wrap.pm b/LatexIndent/Wrap.pm
index 6e8548f5..dd5a41eb 100644
--- a/LatexIndent/Wrap.pm
+++ b/LatexIndent/Wrap.pm
@@ -20,14 +20,14 @@ use warnings;
 use Text::Wrap;
 use LatexIndent::Tokens qw/%tokens/;
 use LatexIndent::AlignmentAtAmpersand qw/get_column_width/;
-use LatexIndent::TrailingComments qw/$trailingCommentRegExp/;
+use LatexIndent::TrailingComments qw/$trailingCommentRegExp @trailingComments/;
 use LatexIndent::GetYamlSettings qw/%mainSettings/;
 use LatexIndent::Switches qw/$is_t_switch_active $is_tt_switch_active $is_m_switch_active/;
 use LatexIndent::LogFile qw/$logger/;
 use LatexIndent::Verbatim qw/%verbatimStorage/;
 use Exporter qw/import/;
-our @ISA       = "LatexIndent::Document";    # class inheritance, Programming Perl, pg 321
-our @EXPORT_OK = qw/text_wrap/;
+our @ISA       = "LatexIndent::Document";                  # class inheritance, Programming Perl, pg 321
+our @EXPORT_OK = qw/text_wrap text_wrap_comment_blocks/;
 our $sentenceCounter;
 
 sub text_wrap {
@@ -35,9 +35,9 @@ sub text_wrap {
 
     $logger->trace("*Text wrap regular expression construction: (see textWrapOptions: )") if $is_t_switch_active;
 
+    #
     # textWrap Blocks FOLLOW
-    # textWrap Blocks FOLLOW
-    # textWrap Blocks FOLLOW
+    #
     my $blocksFollow     = q();
     my $blocksFollowHash = \%{ ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{blocksFollow} };
 
@@ -120,12 +120,13 @@ sub text_wrap {
     # followed by 0 or more h-space and line breaks
     $blocksFollow = ( $blocksFollow eq '' ? q() : qr/(?:$blocksFollow)(?:\h|\R)*/sx );
 
-    $logger->trace("textWrap blocks follow regexp:") if ($is_tt_switch_active and ${$self}{modifyLineBreaksYamlName} ne 'sentence');
+    $logger->trace("textWrap blocks follow regexp:")
+        if ( $is_tt_switch_active and ${$self}{modifyLineBreaksYamlName} ne 'sentence' );
     $logger->trace($blocksFollow) if $is_tt_switch_active;
 
+    #
     # textWrap Blocks BEGIN with
-    # textWrap Blocks BEGIN with
-    # textWrap Blocks BEGIN with
+    #
     my $blocksBeginWith     = q();
     my $blocksBeginWithHash = \%{ ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{blocksBeginWith} };
 
@@ -160,9 +161,9 @@ sub text_wrap {
     }
     $blocksBeginWith = qr/$blocksBeginWith/;
 
+    #
     # textWrap Blocks END with
-    # textWrap Blocks END with
-    # textWrap Blocks END with
+    #
     my $blocksEndBefore     = q();
     my $blocksEndBeforeHash = \%{ ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{blocksEndBefore} };
 
@@ -197,10 +198,11 @@ sub text_wrap {
     }
     $blocksEndBefore = qr/$blocksEndBefore/;
 
+    #
     # the OVERALL textWrap Blocks regexp
-    # the OVERALL textWrap Blocks regexp
-    # the OVERALL textWrap Blocks regexp
-    $logger->trace("Overall textWrap Blocks end with regexp:") if ($is_tt_switch_active and ${$self}{modifyLineBreaksYamlName} ne 'sentence');
+    #
+    $logger->trace("Overall textWrap Blocks end with regexp:")
+        if ( $is_tt_switch_active and ${$self}{modifyLineBreaksYamlName} ne 'sentence' );
     $logger->trace($blocksEndBefore) if $is_tt_switch_active;
 
     # store the text wrap blocks
@@ -250,27 +252,27 @@ sub text_wrap {
             or ${$self}{modifyLineBreaksYamlName} eq 'sentence' )
         {
 
-            # text wrap AFTER indentation needs to turn, for example (with columns: 100),
-            #
-            # before:
-            #
-            #  \begin{abstract}
-            #      This is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation.
-            #  \end{abstract}
-            #
-            # after:
-            #
-            #  \begin{abstract}
-            #      This is a very long sentence that should be wrapped at some point, which is the case but is is
-            #      is is line width is not respected because of the indentation.
-            #  \end{abstract}
-            #  ----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|
-            #     5   10   15   20   25   30   35   40   45   50   55   60   65   70   75   80   85   90   95   100   105   110
-            #
-            # note: it respects the column width AND indentation
-            #
-            # see also: test-cases/text-wrap/issue-359*.tex
-            #
+# text wrap AFTER indentation needs to turn, for example (with columns: 100),
+#
+# before:
+#
+#  \begin{abstract}
+#      This is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation.
+#  \end{abstract}
+#
+# after:
+#
+#  \begin{abstract}
+#      This is a very long sentence that should be wrapped at some point, which is the case but is is
+#      is is line width is not respected because of the indentation.
+#  \end{abstract}
+#  ----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|
+#     5   10   15   20   25   30   35   40   45   50   55   60   65   70   75   80   85   90   95   100   105   110
+#
+# note: it respects the column width AND indentation
+#
+# see also: test-cases/text-wrap/issue-359*.tex
+#
             if ( ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{when} eq 'after' ) {
 
                 # reset columns
@@ -279,15 +281,68 @@ sub text_wrap {
                 # reset subsequent Space
                 $subsequentSpace = q();
 
+                my $numberOfTABS = 0;
+
                 # measure leading horizontal space
                 if ( ${$self}{modifyLineBreaksYamlName} eq 'sentence' ) {
-                    $subsequentSpace = (${$self}{follows} ? " " x length( ( split( /\R/, ${$self}{follows} ) )[-1] ):q());
+                    my $thingToMeasure = ( split( /\R/, ${$self}{follows} ) )[-1];
+
+                    $subsequentSpace
+                        = ( ${$self}{follows} ? " " x length( $thingToMeasure ): q());
+
+                    # possible tab adjustments
+                    $thingToMeasure = q() if (not defined $thingToMeasure);
+                    $numberOfTABS = () = $thingToMeasure =~ m/\t/g;
+                    for (my $i=1; $i<=$numberOfTABS;$i++){
+                        $subsequentSpace =~ s/ /    /;
+                    }
                 }
                 else {
-                    $subsequentSpace
-                        = ($textWrapBlockCount == 0 ? q() : " " x length( ( split( /\R/, $textWrapBlockStorage[ $textWrapBlockCount - 1 ] ) )[-1] ));
+                    # note, in the above we have defined
+                    #
+                    #   @textWrapBlockStorage = split( /(\s*$blocksFollow)/, ${$self}{body} )
+                    #
+                    # so that both the *match* AND the *block* are stored, so
+                    #
+                    #   ( split( /\R/, $textWrapBlockStorage[ $textWrapBlockCount - 1 ] ) )[-1]
+                    #
+                    # represents the *match*
+                    #
+
+                    # scenarios such as
+                    #
+                    #       % comment goes here
+                    #       text that isn't commented
+                    #
+                    # means that the *match* doesn't contain a linebreak
+                    #
+                    if ( scalar( split( /\R/, $textWrapBlockStorage[ $textWrapBlockCount - 1 ] ) ) == 1
+                        and ( split( /\R/, $textWrapBlockStorage[ $textWrapBlockCount - 1 ] ) )[-1]
+                        =~ m/$trailingCommentRegExp/ )
+                    {
+                        $subsequentSpace = q();
+                    }
+                    else {
+                        my $thingToMeasure = ( split( /\R/, $textWrapBlockStorage[ $textWrapBlockCount - 1 ] ) )[-1];
+
+                        $subsequentSpace
+                            = ( $textWrapBlockCount == 0
+                            ? q()
+                            : " " x length($thingToMeasure) );
+
+                        # possible tab adjustments
+                        $numberOfTABS = () = $thingToMeasure =~ m/\t/g;
+                        for (my $i=1; $i<=$numberOfTABS;$i++){
+                            $subsequentSpace =~ s/ /    /;
+                        }
+                    }
                 }
                 $Text::Wrap::columns = $columns - length($subsequentSpace);
+
+                # possible tab adjustments
+                for (my $i=1; $i<=$numberOfTABS;$i++){
+                    $subsequentSpace =~ s/    /\t/;
+                }
             }
 
             # LIMIT is one greater than the maximum number of times EXPR may be split
@@ -444,6 +499,47 @@ sub text_wrap {
                 $textWrapBlockStorageValue =~ s/^\h*//s unless ${$self}{modifyLineBreaksYamlName} eq 'sentence';
             }
 
+            #
+            # optionally wrap comments
+            #
+            if ( ${ ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{comments} }{wrap}
+                and $trailingComments ne '' )
+            {
+
+                my $commentValue = q();
+
+                # split the trailing comments, and put the *values* together
+                foreach ( split( /([0-9]+)$tokens{endOfToken}/, $trailingComments ) ) {
+                    next unless $_ =~ m/[0-9]/;
+
+                    $commentValue .= ${ $trailingComments[ $_ - 1 ] }{value};
+                }
+
+# leading comment space, e.g.
+#
+#     %     This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+#      ^^^^^
+#
+                $commentValue =~ m/^(\h+)/s;
+                my $leadingCommentSpace = ( $1 ? $1 : ' ' );
+
+                # reset columns
+                $Text::Wrap::columns
+                    = $columns - &get_column_width( ( split( /\R/, $textWrapBlockStorageValue ) )[-1] );
+                $commentValue = wrap( '', '', $commentValue );
+
+                # the 2nd and subsequent lines need further attention
+                my @commentArray             = ( split( /\R/, $commentValue ) );
+                my $firstLine                = shift(@commentArray);
+                my $secondCommentLineOnwards = join( " ", @commentArray );
+                $secondCommentLineOnwards =~ s/\h{2,}/ /sg;
+
+                # assemble the new trailing comments, which will be wrapped after this routine as a comment block
+                $trailingComments = "%" . $self->add_comment_symbol( value => $firstLine );
+                $trailingComments .= "\n$subsequentSpace%"
+                    . $self->add_comment_symbol( value => $leadingCommentSpace . $secondCommentLineOnwards );
+            }
+
             # append trailing comments from WITHIN the block
             $textWrapBlockStorageValue =~ s/\R?$/$trailingComments\n/s if ( $trailingComments ne '' );
 
@@ -472,4 +568,142 @@ sub text_wrap {
 
 }
 
+sub text_wrap_comment_blocks {
+
+    my $self = shift;
+
+    # call the text wrapping routine
+    my $columns = ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{columns};
+
+    #
+    # text wrap comment blocks
+    #
+    #
+    # from:
+    #
+    #   % first comment
+    #   % second comment
+    #   % third comment
+    #   % fourth comment
+    #   % fifth comment
+    #
+    # into:
+    #
+    #   % first comment second comment
+    #   % third comment fourth comment
+    #   % fifth comment
+    #
+    ${$self}{body} =~ s&((?:^\h*$trailingCommentRegExp\R)+)&
+          my @commentBlocks = $1;
+          my $trailingComments = q();
+
+          # loop through comment blocks
+          foreach my $commentBlock (@commentBlocks){
+
+                  my $leadingHorizontalSpace = ($commentBlock =~ m|^(\h*\t*)|s? $1 : q());
+                  my $numberOfTABS = () = $leadingHorizontalSpace =~ m/\t/g;
+                  $leadingHorizontalSpace =~ s/\t/    /g;
+
+                  my $commentValue = q();
+                  $trailingComments = q();
+
+                  # split the trailing comments, and put the *values* together
+                  foreach (split(/([0-9]+)$tokens{endOfToken}/,$commentBlock)){
+                     next unless $_ =~ m/[0-9]/;
+
+                     $commentValue .= " ".${$trailingComments[$_-1]}{value};
+                  }
+
+                  # very first space
+                  $commentValue =~ s|^\h||s;
+
+                  # leading space
+                  $commentValue =~ s|^(\h*)||s;
+                  my $leadingSpace =  (${${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{comments}}{inheritLeadingSpace}? $1: ' ' );
+
+                  $commentValue =~ s/\h{2,}/ /sg if ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{multipleSpacesToSingle};
+
+                  # reset columns
+                  $Text::Wrap::columns = $columns - length($leadingHorizontalSpace)-length($leadingSpace);
+                  #                                                                ^^
+                  #                                                                for the space added after comment symbol below
+                  
+                  # tab adjustment
+                  for (my $i=1; $i<=$numberOfTABS;$i++){
+                      $leadingHorizontalSpace =~ s/    /\t/;
+                  }
+
+                  # wrap the comments
+                  $commentValue = wrap( '', '', $commentValue );
+
+                  # put them into storage
+                  $trailingComments .= $leadingHorizontalSpace."%".$self->add_comment_symbol(value=>$leadingSpace.$_)."\n" foreach (split( /\R/, $commentValue ) );
+            
+          }
+          $trailingComments;
+    &xemg;
+
+    #
+    # text wrap multiple comments on a line
+    #
+    # from:
+    #
+    #   % fifth comment% fourth comment% third comment% second comment% first comment
+    #
+    # into:
+    #
+    #   % first comment second comment
+    #   % third comment fourth comment
+    #   % fifth comment
+    #
+    ${$self}{body} =~ s&((?:$trailingCommentRegExp\h*)+)&
+          my @commentBlocks = $1;
+          my $trailingComments = q();
+
+          # loop through comment blocks
+          foreach my $commentBlock (@commentBlocks){
+
+                  my $leadingHorizontalSpace = ($commentBlock =~ m|^(\h*\t*)|s? $1 : q());
+                  my $numberOfTABS = () = $leadingHorizontalSpace =~ m/\t/g;
+                  $leadingHorizontalSpace =~ s/\t/    /g;
+
+                  my $commentValue = q();
+                  $trailingComments = q();
+
+                  # split the trailing comments, and put the *values* together
+                  foreach (split(/([0-9]+)$tokens{endOfToken}/,$commentBlock)){
+                     next unless $_ =~ m/[0-9]/;
+
+                     $commentValue .= " ".${$trailingComments[$_-1]}{value};
+                  }
+
+                  # very first space
+                  $commentValue =~ s|^\h||s;
+
+                  # leading space
+                  $commentValue =~ s|^(\h*)||s;
+                  my $leadingSpace =  (${${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{comments}}{inheritLeadingSpace}? $1: ' ' );
+
+                  $commentValue =~ s/\h{2,}/ /sg if ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{multipleSpacesToSingle};
+
+                  # reset columns
+                  $Text::Wrap::columns = $columns - length($leadingHorizontalSpace)-length($leadingSpace);
+                  #                                                                ^^
+                  #                                                                for the space added after comment symbol below
+                  
+                  # tab adjustment
+                  for (my $i=1; $i<=$numberOfTABS;$i++){
+                      $leadingHorizontalSpace =~ s/    /\t/;
+                  }
+
+                  # wrap the comments
+                  $commentValue = wrap( '', '', $commentValue );
+
+                  # put them into storage
+                  $trailingComments .= $leadingHorizontalSpace."%".$self->add_comment_symbol(value=>$leadingSpace.$_)."\n" foreach (split( /\R/, $commentValue ) );
+            
+          }
+          $trailingComments;
+    &xemg;
+}
 1;
diff --git a/defaultSettings.yaml b/defaultSettings.yaml
index 29039453..642ba4ca 100644
--- a/defaultSettings.yaml
+++ b/defaultSettings.yaml
@@ -525,6 +525,9 @@ modifyLineBreaks:
         multipleSpacesToSingle: 1              
         removeBlockLineBreaks: 1
         when: before                        # before/after
+        comments: 
+           wrap: 0                          # 0/1
+           inheritLeadingSpace: 0           # 0/1
         blocksFollow:
            headings: 1                      # 0/1
            commentOnPreviousLine: 1         #  |
diff --git a/documentation/demonstrations/documentation-test-cases.sh b/documentation/demonstrations/documentation-test-cases.sh
index a3b00cf9..aeaa9821 100755
--- a/documentation/demonstrations/documentation-test-cases.sh
+++ b/documentation/demonstrations/documentation-test-cases.sh
@@ -258,6 +258,13 @@ latexindent.pl -s textwrap8.tex -o=+-mod2.tex -l=tw-after1.yaml,addruler1  -m -r
 latexindent.pl -s multiple-sentences8.tex -o=+-mod1.tex -l=sentence-wrap2,addruler1 -m -r
 latexindent.pl -s multiple-sentences8.tex -o=+-mod2.tex -l=sentence-wrap3,addruler1 -m -r
 
+# wrap comments
+latexindent.pl -s -r -m -l wrap-comments1.yaml,addruler1.yaml textwrap9.tex -o=+-mod1
+
+latexindent.pl -s -r -m -l wrap-comments1.yaml,addruler1.yaml textwrap10.tex -o=+-mod1
+latexindent.pl -s -r -m -l wrap-comments2.yaml,addruler1.yaml textwrap10.tex -o=+-mod2
+
+latexindent.pl -s multiple-sentences9.tex -o=+-mod1.tex -l=sentence-wrap4,addruler1 -m -r
 # text wrap trailing comments
 for i in {1..6};
 do
diff --git a/documentation/demonstrations/multiple-sentences9-mod1.tex b/documentation/demonstrations/multiple-sentences9-mod1.tex
new file mode 100644
index 00000000..7ab5f4ce
--- /dev/null
+++ b/documentation/demonstrations/multiple-sentences9-mod1.tex
@@ -0,0 +1,9 @@
+This paragraph has line breaks
+throughout its paragraph; we would
+like to combine the textwrapping
+and paragraph removal routine.
+% first comment second comment
+% third comment fourth comment
+% fifth comment
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/documentation/demonstrations/multiple-sentences9.tex b/documentation/demonstrations/multiple-sentences9.tex
new file mode 100644
index 00000000..8d69264e
--- /dev/null
+++ b/documentation/demonstrations/multiple-sentences9.tex
@@ -0,0 +1,5 @@
+This paragraph% first comment
+has line breaks throughout its paragraph;% second comment
+we would like to combine% third comment
+the textwrapping% fourth comment
+and paragraph removal routine. % fifth comment
diff --git a/documentation/demonstrations/sentence-wrap4.yaml b/documentation/demonstrations/sentence-wrap4.yaml
new file mode 100644
index 00000000..c4fc5126
--- /dev/null
+++ b/documentation/demonstrations/sentence-wrap4.yaml
@@ -0,0 +1,9 @@
+defaultIndent: '   '
+modifyLineBreaks:
+    oneSentencePerLine:
+        manipulateSentences: 1     
+        textWrapSentences: 1
+    textWrapOptions:
+        columns: 35
+        comments: 
+          wrap: 1  #<!-------
diff --git a/documentation/demonstrations/textwrap10-mod1.tex b/documentation/demonstrations/textwrap10-mod1.tex
new file mode 100644
index 00000000..4ee1d0e5
--- /dev/null
+++ b/documentation/demonstrations/textwrap10-mod1.tex
@@ -0,0 +1,5 @@
+My first sentence
+% first comment second third
+% comment fourth
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/documentation/demonstrations/textwrap10-mod2.tex b/documentation/demonstrations/textwrap10-mod2.tex
new file mode 100644
index 00000000..60bc9366
--- /dev/null
+++ b/documentation/demonstrations/textwrap10-mod2.tex
@@ -0,0 +1,5 @@
+My first sentence
+%    first comment second third
+%    comment fourth
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/documentation/demonstrations/textwrap10.tex b/documentation/demonstrations/textwrap10.tex
new file mode 100644
index 00000000..57943ba3
--- /dev/null
+++ b/documentation/demonstrations/textwrap10.tex
@@ -0,0 +1,5 @@
+My first sentence
+%    first comment
+%   second
+%third comment
+%     fourth
diff --git a/documentation/demonstrations/textwrap9-mod1.tex b/documentation/demonstrations/textwrap9-mod1.tex
new file mode 100644
index 00000000..4ee1d0e5
--- /dev/null
+++ b/documentation/demonstrations/textwrap9-mod1.tex
@@ -0,0 +1,5 @@
+My first sentence
+% first comment second third
+% comment fourth
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/documentation/demonstrations/textwrap9.tex b/documentation/demonstrations/textwrap9.tex
new file mode 100644
index 00000000..888a0f1f
--- /dev/null
+++ b/documentation/demonstrations/textwrap9.tex
@@ -0,0 +1,5 @@
+My first sentence
+% first comment
+%   second
+%third comment
+%     fourth
diff --git a/documentation/demonstrations/wrap-comments1.yaml b/documentation/demonstrations/wrap-comments1.yaml
new file mode 100644
index 00000000..9baa896c
--- /dev/null
+++ b/documentation/demonstrations/wrap-comments1.yaml
@@ -0,0 +1,5 @@
+modifyLineBreaks:
+  textWrapOptions:
+    columns: 35
+    comments: 
+      wrap: 1  #<!-------
diff --git a/documentation/demonstrations/wrap-comments2.yaml b/documentation/demonstrations/wrap-comments2.yaml
new file mode 100644
index 00000000..8cd0aef2
--- /dev/null
+++ b/documentation/demonstrations/wrap-comments2.yaml
@@ -0,0 +1,6 @@
+modifyLineBreaks:
+  textWrapOptions:
+    columns: 35
+    comments: 
+      wrap: 1                #<!-------
+      inheritLeadingSpace: 1 #<!-------
diff --git a/documentation/documentation-default-settings-update.pl b/documentation/documentation-default-settings-update.pl
index d2df139e..58ac78b6 100755
--- a/documentation/documentation-default-settings-update.pl
+++ b/documentation/documentation-default-settings-update.pl
@@ -33,7 +33,7 @@
                         {name=>"commandCodeBlocks",numberOfLines=>15},
                         {name=>"modifylinebreaks",numberOfLines=>2,special=>"modifyLineBreaks",mustBeAtBeginning=>1},
                         {name=>"textWrapOptions",numberOfLines=>1},
-                        {name=>"textWrapOptionsAll",numberOfLines=>24,special=>"textWrapOptions"},
+                        {name=>"textWrapOptionsAll",numberOfLines=>27,special=>"textWrapOptions"},
                         {name=>"oneSentencePerLine",numberOfLines=>24},
                         {name=>"sentencesFollow",numberOfLines=>8},
                         {name=>"sentencesBeginWith",numberOfLines=>3},
diff --git a/documentation/latexindent.tex b/documentation/latexindent.tex
index 9b3a1a80..721a138d 100644
--- a/documentation/latexindent.tex
+++ b/documentation/latexindent.tex
@@ -481,7 +481,7 @@
 
 \lstdefinestyle{textWrapOptionsAll}{
  style=yaml-LST,
- firstnumber=523,linerange={523-547},
+ firstnumber=523,linerange={523-550},
  numbers=left,
 }
 
@@ -511,19 +511,19 @@
 
 \lstdefinestyle{modifylinebreaksEnv}{
  style=yaml-LST,
- firstnumber=549,linerange={549-558},
+ firstnumber=552,linerange={552-561},
  numbers=left,
 }
 
 \lstdefinestyle{replacements}{
  style=yaml-LST,
- firstnumber=610,linerange={610-618},
+ firstnumber=613,linerange={613-621},
  numbers=left,
 }
 
 \lstdefinestyle{fineTuning}{
  style=yaml-LST,
- firstnumber=621,linerange={621-673},
+ firstnumber=624,linerange={624-676},
  numbers=left,
 }
 
diff --git a/documentation/localSettings.yaml b/documentation/localSettings.yaml
index d05abe53..6cdbe3c9 100644
--- a/documentation/localSettings.yaml
+++ b/documentation/localSettings.yaml
@@ -81,7 +81,7 @@ modifyLineBreaks:
                 |
                 \\cmhlistingsfromfile
                 |
-                \\end\{[^}]+?\}
+                \\end\{[^}]+?\}(?!\s*\\item)
         blocksBeginWith:
            other: \\announce
         blocksEndBefore:
diff --git a/documentation/sec-fine-tuning.tex b/documentation/sec-fine-tuning.tex
index 338f240e..dca2e8c7 100644
--- a/documentation/sec-fine-tuning.tex
+++ b/documentation/sec-fine-tuning.tex
@@ -73,7 +73,7 @@ \section{Fine tuning}\label{sec:finetuning}
                \lstinline^.*?^ means anything in between \lstinline^<...>^
         \end{enumerate}
   \item the \texttt{modifyLineBreaks} field refers to fine tuning settings detailed in
-      \vref{sec:modifylinebreaks}. In particular:
+        \vref{sec:modifylinebreaks}. In particular:
         \begin{enumerate}
          \item \texttt{betterFullStop} is in relation to the one sentence per line routine, detailed in
                \vref{sec:onesentenceperline}
diff --git a/documentation/subsec-one-sentence-per-line.tex b/documentation/subsec-one-sentence-per-line.tex
index 62d373c5..19d55229 100644
--- a/documentation/subsec-one-sentence-per-line.tex
+++ b/documentation/subsec-one-sentence-per-line.tex
@@ -27,9 +27,9 @@ \subsubsection{oneSentencePerLine: overview}
          \item \emph{begin} with the fields specified in \texttt{sentencesBeginWith}
          \item \emph{end} with the fields specified in \texttt{sentencesEndWith}
         \end{enumerate}
-  \item by default, the oneSentencePerLine routine will remove line breaks within sentences
-      because \texttt{removeBlockLineBreaks} is set to 1; switch it to 0 if you wish to
-      change this;
+  \item by default, the oneSentencePerLine routine will remove line breaks within
+        sentences because \texttt{removeBlockLineBreaks} is set to 1; switch it to 0 if
+        you wish to change this;
   \item sentences can be text wrapped according to \texttt{textWrapSentences}, and will
         be done either \texttt{before} or \texttt{after} the main indentation routine
         (see \cref{subsubsec:ospl:before:after});
@@ -125,7 +125,7 @@ \subsubsection{oneSentencePerLine: overview}
 
  \cmhlistingsfromfile[style=sentencesEndWith]{../defaultSettings.yaml}[MLB-TCB,width=.9\linewidth,before=\centering]{\texttt{sentencesEndWith}}{lst:sentencesEndWith}
 
-\subsubsection{sentencesFollow}
+\subsubsection{oneSentencePerLine: sentencesFollow}
  Let's explore a few of the switches in \texttt{sentencesFollow}.
 
  \begin{example}
@@ -184,7 +184,7 @@ \subsubsection{sentencesFollow}
  accounted for correctly.
  \end{example}
 
-\subsubsection{sentencesBeginWith}
+\subsubsection{oneSentencePerLine: sentencesBeginWith}
  By default, \texttt{latexindent.pl} will only assume that sentences begin with the upper
  case letters \texttt{A-Z}; you can instruct the script to define sentences to begin with
  lower case letters (see \cref{lst:sentencesBeginWith}), and we can use the
@@ -226,7 +226,7 @@ \subsubsection{sentencesBeginWith}
  \texttt{9}.
  \end{example}
 
-\subsubsection{sentencesEndWith}
+\subsubsection{oneSentencePerLine: sentencesEndWith}
  \begin{example}
  Let's return to \vref{lst:multiple-sentences}; we have already seen the default way in
  which \texttt{latexindent.pl} will operate on the sentences in this file in
@@ -381,7 +381,7 @@ \subsubsection{Features of the oneSentencePerLine routine}
  \end{cmhtcbraster}
  \end{example}
 
-\subsubsection{Text wrapping and indenting sentences}
+\subsubsection{oneSentencePerLine: text wrapping and indenting sentences}
  The \texttt{oneSentencePerLine} \announce{2018-08-13}{oneSentencePerline text wrap and
  indent} can be instructed to perform text wrapping and indentation upon sentences.
  \index{sentences!text wrapping} \index{sentences!indenting}%
@@ -472,7 +472,7 @@ \subsubsection{Text wrapping and indenting sentences}
  the \texttt{oneSentencePerLine} routine determines if it will remove line breaks while
  text wrapping, from the value of \texttt{removeSentenceLineBreaks}.
 
-\subsubsection{Text wrapping and indenting sentences, when before/after}\label{subsubsec:ospl:before:after}
+\subsubsection{oneSentencePerLine: text wrapping and indenting sentences, when before/after}\label{subsubsec:ospl:before:after}
  The text wrapping routine operates, by default, \texttt{before} the \announce{new}{text
  wrap: before/after details} code blocks have been found, but this can be changed to
  \texttt{after}:
@@ -493,7 +493,7 @@ \subsubsection{Text wrapping and indenting sentences, when before/after}\label{s
  Using the settings given in \cref{lst:sentence-wrap2} and running the command
 
  \begin{commandshell}
-latexindent.pl -s multiple-sentences8.tex -o=+-mod1.tex -l=sentence-wrap2.yaml -m
+latexindent.pl multiple-sentences8 -o=+-mod1.tex -l=sentence-wrap2 -m
    \end{commandshell}
 
  gives the output given in \cref{lst:multiple-sentences8-mod1}.
@@ -518,7 +518,7 @@ \subsubsection{Text wrapping and indenting sentences, when before/after}\label{s
  Using the settings given in \cref{lst:sentence-wrap3} and running the command
 
  \begin{commandshell}
-latexindent.pl -s multiple-sentences8.tex -o=+-mod2.tex -l=sentence-wrap3.yaml -m
+latexindent.pl multiple-sentences8.tex -o=+-mod2.tex -l=sentence-wrap3 -m
    \end{commandshell}
 
  gives the output given in \cref{lst:multiple-sentences8-mod2}.
@@ -535,3 +535,34 @@ \subsubsection{Text wrapping and indenting sentences, when before/after}\label{s
  \emph{obeyed} the specified value of \texttt{columns} (35) given in
  \cref{lst:sentence-wrap3}.
  \end{example}
+
+\subsubsection{oneSentencePerLine: text wrapping sentences and comments}\label{subsubsec:ospl:tw:comments}
+ We demonstrate the one sentence per line routine with respect to text wrapping
+ \emph{comments}. See also \cref{subsubsec:tw:comments}. \index{comments!text wrap}
+ \index{text wrap!comments} \index{sentences!comments} \index{sentences!text wrap}
+
+ \begin{example}
+ Let's begin with the file in \cref{lst:multiple-sentences9}.
+
+ \cmhlistingsfromfile*{demonstrations/multiple-sentences9.tex}{\texttt{multiple-sentences9.tex}}{lst:multiple-sentences9}
+
+ Using the settings given in \cref{lst:sentence-wrap4} and running the command
+
+ \begin{commandshell}
+latexindent.pl multiple-sentences9 -o=+-mod1.tex -l=sentence-wrap4 -m
+   \end{commandshell}
+
+ gives the output given in \cref{lst:multiple-sentences9-mod1}.
+
+ \begin{cmhtcbraster}[raster columns=2,
+   raster left skip=-1.5cm,
+   raster right skip=-0cm,
+   raster column skip=.06\linewidth]
+  \cmhlistingsfromfile*{demonstrations/multiple-sentences9-mod1.tex}{\texttt{multiple-sentences9-mod1.tex}}{lst:multiple-sentences9-mod1}
+  \cmhlistingsfromfile*[style=yaml-LST]{demonstrations/sentence-wrap4.yaml}[MLB-TCB,width=0.4\linewidth]{\texttt{sentence-wrap4.yaml}}{lst:sentence-wrap4}
+ \end{cmhtcbraster}
+
+ We note that, in \cref{lst:multiple-sentences9-mod1}, that the sentences have been
+ wrapped, and so too have the comments because of the annotated line in
+ \cref{lst:sentence-wrap4}.
+ \end{example}
diff --git a/documentation/subsec-poly-switches.tex b/documentation/subsec-poly-switches.tex
index 24b3d64e..410af811 100644
--- a/documentation/subsec-poly-switches.tex
+++ b/documentation/subsec-poly-switches.tex
@@ -1105,7 +1105,7 @@ \subsubsection{Conflicting poly-switches: nested code blocks}
                \texttt{EndFinishesWithLineBreak} is $1$ or $2$).
         \end{itemize}
   \item Phase 2: indentation, in which white space is added to the begin, body, and end
-      statements;
+        statements;
   \item Phase 3: unpacking, in which unique ids are replaced by their \emph{indented}
         code blocks; if the -m switch is active, then during this phase,
         \begin{itemize}
diff --git a/documentation/subsec-text-wrap.tex b/documentation/subsec-text-wrap.tex
index b31a58ca..51a5bfcb 100644
--- a/documentation/subsec-text-wrap.tex
+++ b/documentation/subsec-text-wrap.tex
@@ -29,8 +29,8 @@ \subsubsection{Text wrap: overview}
          \item \emph{end} before the fields specified in \texttt{blocksEndBefore}
         \end{enumerate}
   \item setting \texttt{columns} to a value $>0$ will text wrap blocks by first removing
-      line breaks, and then wrapping according to the specified value of
-      \texttt{columns};
+        line breaks, and then wrapping according to the specified value of
+        \texttt{columns};
   \item setting \texttt{columns} to $-1$ will \emph{only} remove line breaks within the
         text wrap block;
   \item by default, the text wrapping routine will remove line breaks within text blocks
@@ -45,8 +45,11 @@ \subsubsection{Text wrap: overview}
                block (see \cref{lst:tw-tc4});
          \item the number of spaces between the end of the text wrap block and the
                (possibly combined) trailing comments is determined by the spaces (if any)
-               at the end of the text wrap block (see \cref{lst:tw-tc5}).
+               at the end of the text wrap block (see \cref{lst:tw-tc5});
         \end{enumerate}
+  \item trailing comments can receive text wrapping \announce{new}{text wrap trailing
+        comments}; examples are shown in \cref{subsubsec:tw:comments} and
+        \cref{subsubsec:ospl:tw:comments}.
  \end{enumerate}
 
  We demonstrate this feature using a series of examples.
@@ -527,7 +530,7 @@ \subsubsection{Text wrap: when before/after}\label{subsubsec:tw:before:after}
  Using the settings given in \cref{lst:tw-before1} and running the command
 
  \begin{commandshell}
-latexindent.pl -s textwrap8.tex -o=+-mod1.tex -l=tw-before1.yaml -m
+latexindent.pl textwrap8.tex -o=+-mod1.tex -l=tw-before1.yaml -m
    \end{commandshell}
 
  gives the output given in \cref{lst:textwrap8-mod1}.
@@ -551,7 +554,7 @@ \subsubsection{Text wrap: when before/after}\label{subsubsec:tw:before:after}
  Using the settings given in \cref{lst:tw-after1} and running the command
 
  \begin{commandshell}
-latexindent.pl -s textwrap8.tex -o=+-mod2.tex -l=tw-after1.yaml -m
+latexindent.pl textwrap8.tex -o=+-mod2.tex -l=tw-after1.yaml -m
    \end{commandshell}
 
  gives the output given in \cref{lst:textwrap8-mod2}.
@@ -568,6 +571,87 @@ \subsubsection{Text wrap: when before/after}\label{subsubsec:tw:before:after}
  specified value of \texttt{columns} (35) given in \cref{lst:tw-after1}.
  \end{example}
 
+\subsubsection{Text wrap: wrapping comments}\label{subsubsec:tw:comments}
+ You can instruct \texttt{latexindent.pl} to apply text wrapping to comments
+ \announce{new}{text wrap trailing comments}; we demonstrate this with examples, see also
+ \cref{subsubsec:ospl:tw:comments}. \index{comments!text wrap} \index{text wrap!comments}
+
+ \begin{example}
+ We use the file in \cref{lst:textwrap9} which contains a trailing comment block.
+
+ \cmhlistingsfromfile*{demonstrations/textwrap9.tex}{\texttt{textwrap9.tex}}{lst:textwrap9}
+
+ Using the settings given in \cref{lst:wrap-comments1} and running the command
+
+ \begin{commandshell}
+latexindent.pl textwrap9.tex -o=+-mod1.tex -l=wrap-comments1.yaml -m
+   \end{commandshell}
+
+ gives the output given in \cref{lst:textwrap9-mod1}.
+
+ \begin{cmhtcbraster}[raster columns=2,
+   raster left skip=-1.5cm,
+   raster right skip=-0cm,
+   raster column skip=.06\linewidth]
+  \cmhlistingsfromfile*{demonstrations/textwrap9-mod1.tex}{\texttt{textwrap9-mod1.tex}}{lst:textwrap9-mod1}
+  \cmhlistingsfromfile*[style=yaml-LST]{demonstrations/wrap-comments1.yaml}[MLB-TCB,width=0.4\linewidth]{\texttt{wrap-comments1.yaml}}{lst:wrap-comments1}
+ \end{cmhtcbraster}
+
+ We note that, in \cref{lst:textwrap9-mod1}, that the comments have been \emph{combined
+ and wrapped} because of the annotated line specified in \cref{lst:wrap-comments1}.
+ \end{example}
+
+ \begin{example}
+ We use the file in \cref{lst:textwrap10} which contains a trailing comment block.
+
+ \cmhlistingsfromfile*{demonstrations/textwrap10.tex}{\texttt{textwrap10.tex}}{lst:textwrap10}
+
+ Using the settings given in \cref{lst:wrap-comments1:repeat} and running the command
+
+ \begin{commandshell}
+latexindent.pl textwrap10.tex -o=+-mod1.tex -l=wrap-comments1.yaml -m
+   \end{commandshell}
+
+ gives the output given in \cref{lst:textwrap10-mod1}.
+
+ \begin{cmhtcbraster}[raster columns=2,
+   raster left skip=-1.5cm,
+   raster right skip=-0cm,
+   raster column skip=.06\linewidth]
+  \cmhlistingsfromfile*{demonstrations/textwrap10-mod1.tex}{\texttt{textwrap10-mod1.tex}}{lst:textwrap10-mod1}
+  \cmhlistingsfromfile*[style=yaml-LST]{demonstrations/wrap-comments1.yaml}[MLB-TCB,width=0.4\linewidth]{\texttt{wrap-comments1.yaml}}{lst:wrap-comments1:repeat}
+ \end{cmhtcbraster}
+
+ We note that, in \cref{lst:textwrap10-mod1}, that the comments have been \emph{combined
+ and wrapped} because of the annotated line specified in
+ \cref{lst:wrap-comments1:repeat}, and that the space from the leading comment has not
+ been inherited; we will explore this further in the next example.
+ \end{example}
+
+ \begin{example}
+ We continue to use the file in \cref{lst:textwrap10}.
+
+ Using the settings given in \cref{lst:wrap-comments2} and running the command
+
+ \begin{commandshell}
+latexindent.pl textwrap10.tex -o=+-mod2.tex -l=wrap-comments2.yaml -m
+   \end{commandshell}
+
+ gives the output given in \cref{lst:textwrap10-mod2}.
+
+ \begin{cmhtcbraster}[raster columns=2,
+   raster left skip=-1.5cm,
+   raster right skip=-0cm,
+   raster column skip=.06\linewidth]
+  \cmhlistingsfromfile*{demonstrations/textwrap10-mod2.tex}{\texttt{textwrap10-mod2.tex}}{lst:textwrap10-mod2}
+  \cmhlistingsfromfile*[style=yaml-LST]{demonstrations/wrap-comments2.yaml}[MLB-TCB,width=0.4\linewidth]{\texttt{wrap-comments2.yaml}}{lst:wrap-comments2}
+ \end{cmhtcbraster}
+
+ We note that, in \cref{lst:textwrap10-mod2}, that the comments have been \emph{combined
+ and wrapped} and that the leading space has been inherited because of the annotated
+ lines specified in \cref{lst:wrap-comments2}.
+ \end{example}
+
 \subsubsection{Text wrap: huge, tabstop and separator}
  The \announce{2021-07-23}*{huge:overflow is now default} default value of \texttt{huge}
  is \texttt{overflow}, which means that words will \emph{not} be broken by the text
diff --git a/test-cases/oneSentencePerLine/multiple-sentences9-mod1.tex b/test-cases/oneSentencePerLine/multiple-sentences9-mod1.tex
new file mode 100644
index 00000000..d70517f5
--- /dev/null
+++ b/test-cases/oneSentencePerLine/multiple-sentences9-mod1.tex
@@ -0,0 +1,2 @@
+This paragraph has line breaks throughout its paragraph; we would like to combine the textwrapping and paragraph removal routine.
+% first comment% second comment% third comment% fourth comment% fifth comment
diff --git a/test-cases/oneSentencePerLine/multiple-sentences9-mod2.tex b/test-cases/oneSentencePerLine/multiple-sentences9-mod2.tex
new file mode 100644
index 00000000..c283cacb
--- /dev/null
+++ b/test-cases/oneSentencePerLine/multiple-sentences9-mod2.tex
@@ -0,0 +1,4 @@
+This paragraph has line breaks throughout its paragraph; we would like to combine the textwrapping and paragraph removal routine.
+% first comment second comment
+% third comment fourth comment
+% fifth comment
diff --git a/test-cases/oneSentencePerLine/multiple-sentences9.tex b/test-cases/oneSentencePerLine/multiple-sentences9.tex
new file mode 100644
index 00000000..8d69264e
--- /dev/null
+++ b/test-cases/oneSentencePerLine/multiple-sentences9.tex
@@ -0,0 +1,5 @@
+This paragraph% first comment
+has line breaks throughout its paragraph;% second comment
+we would like to combine% third comment
+the textwrapping% fourth comment
+and paragraph removal routine. % fifth comment
diff --git a/test-cases/oneSentencePerLine/one-sentence-per-line.sh b/test-cases/oneSentencePerLine/one-sentence-per-line.sh
index 33c0ff60..a0af270e 100755
--- a/test-cases/oneSentencePerLine/one-sentence-per-line.sh
+++ b/test-cases/oneSentencePerLine/one-sentence-per-line.sh
@@ -135,6 +135,9 @@ latexindent.pl -s -m -l issue-377a.yaml issue-377.tex -o=+-mod1
 # issue 392
 latexindent.pl -s -m -l issue-392.yaml issue-392.tex -o=+-mod1
 
+latexindent.pl multiple-sentences9.tex -o=+-mod1.tex -l=sentence-wrap4 -m -s -o=+-mod1
+latexindent.pl multiple-sentences9.tex -o=+-mod1.tex -l=sentence-wrap5 -m -s -o=+-mod2
+
 [[ $noisyMode == 1 ]] && makenoise
 [[ $gitStatus == 1 ]] && git status
 
diff --git a/test-cases/oneSentencePerLine/sentence-wrap4.yaml b/test-cases/oneSentencePerLine/sentence-wrap4.yaml
new file mode 100644
index 00000000..e5faf62b
--- /dev/null
+++ b/test-cases/oneSentencePerLine/sentence-wrap4.yaml
@@ -0,0 +1,9 @@
+defaultIndent: '   '
+modifyLineBreaks:
+    oneSentencePerLine:
+        manipulateSentences: 1     
+        textWrapSentences: 0
+    textWrapOptions:
+        columns: 35
+        comments: 
+          wrap: 0  #<!-------
diff --git a/test-cases/oneSentencePerLine/sentence-wrap5.yaml b/test-cases/oneSentencePerLine/sentence-wrap5.yaml
new file mode 100644
index 00000000..e77a944c
--- /dev/null
+++ b/test-cases/oneSentencePerLine/sentence-wrap5.yaml
@@ -0,0 +1,9 @@
+defaultIndent: '   '
+modifyLineBreaks:
+    oneSentencePerLine:
+        manipulateSentences: 1     
+        textWrapSentences: 0
+    textWrapOptions:
+        columns: 35
+        comments: 
+          wrap: 1  #<!-------
diff --git a/test-cases/text-wrap/inherit-leading-space.yaml b/test-cases/text-wrap/inherit-leading-space.yaml
new file mode 100644
index 00000000..ded5474e
--- /dev/null
+++ b/test-cases/text-wrap/inherit-leading-space.yaml
@@ -0,0 +1,4 @@
+modifyLineBreaks:
+  textWrapOptions:
+    comments: 
+      inheritLeadingSpace: 1
diff --git a/test-cases/text-wrap/issue-359a-mod5.tex b/test-cases/text-wrap/issue-359a-mod5.tex
new file mode 100644
index 00000000..cbd4efa1
--- /dev/null
+++ b/test-cases/text-wrap/issue-359a-mod5.tex
@@ -0,0 +1,13 @@
+\begin{abstract}
+	This is a very long sentence that should be wrapped at
+	some point, which is the case but is is is is line
+	width is not respected because of the indentation.
+	\begin{another}
+		Another is a very long sentence that should be
+		wrapped at some point, which is the case but is is
+		is is line width is not respected because of the
+		indentation.
+	\end{another}
+\end{abstract}
+----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40   45   50   55   60   65   70   75   80   85   90   95   100   105   110
diff --git a/test-cases/text-wrap/issue-359a-mod6.tex b/test-cases/text-wrap/issue-359a-mod6.tex
new file mode 100644
index 00000000..baeaa84d
--- /dev/null
+++ b/test-cases/text-wrap/issue-359a-mod6.tex
@@ -0,0 +1,14 @@
+\begin{abstract}
+		This is a very long sentence that should be wrapped
+		at some point, which is the case but is is is is
+		line width is not respected because of the
+		indentation.
+		\begin{another}
+				Another is a very long sentence that should
+				be wrapped at some point, which is the case
+				but is is is is line width is not respected
+				because of the indentation.
+		\end{another}
+\end{abstract}
+----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40   45   50   55   60   65   70   75   80   85   90   95   100   105   110
diff --git a/test-cases/text-wrap/issue-359d.yaml b/test-cases/text-wrap/issue-359d.yaml
new file mode 100644
index 00000000..9a2508e8
--- /dev/null
+++ b/test-cases/text-wrap/issue-359d.yaml
@@ -0,0 +1,18 @@
+defaultIndent: "\t"
+
+modifyLineBreaks:
+    textWrapOptions:
+        columns: 100
+        when: after                          # before/after
+        blocksFollow:
+          other: \\begin\{(?:abstract|another)\}|\\item|\\end\{another\}
+
+replacements:
+  -
+    substitution: |-
+      s!\z!
+        my $rulerMax = int(100/10 +1.5 )*10;
+        my $ruler    = (("----|"x(int($rulerMax/5))))."\n";
+        for (my $i=1;$i<=$rulerMax/5;$i++){ $ruler .= "   ".$i*5 };
+        $ruler."\n";!sxe
+    when: after
diff --git a/test-cases/text-wrap/issue-359e.yaml b/test-cases/text-wrap/issue-359e.yaml
new file mode 100644
index 00000000..9e3e85a6
--- /dev/null
+++ b/test-cases/text-wrap/issue-359e.yaml
@@ -0,0 +1,18 @@
+defaultIndent: "\t\t"
+
+modifyLineBreaks:
+    textWrapOptions:
+        columns: 100
+        when: after                          # before/after
+        blocksFollow:
+          other: \\begin\{(?:abstract|another)\}|\\item|\\end\{another\}
+
+replacements:
+  -
+    substitution: |-
+      s!\z!
+        my $rulerMax = int(100/10 +1.5 )*10;
+        my $ruler    = (("----|"x(int($rulerMax/5))))."\n";
+        for (my $i=1;$i<=$rulerMax/5;$i++){ $ruler .= "   ".$i*5 };
+        $ruler."\n";!sxe
+    when: after
diff --git a/test-cases/text-wrap/issue-389-mod1.tex b/test-cases/text-wrap/issue-389-mod1.tex
new file mode 100644
index 00000000..9454b1d7
--- /dev/null
+++ b/test-cases/text-wrap/issue-389-mod1.tex
@@ -0,0 +1,3 @@
+% This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389a-mod1.tex b/test-cases/text-wrap/issue-389a-mod1.tex
new file mode 100644
index 00000000..5db7a467
--- /dev/null
+++ b/test-cases/text-wrap/issue-389a-mod1.tex
@@ -0,0 +1,7 @@
+here is some leading text % This is a
+% very very long trailing comment that
+% needs to be wrapped by latexindent to
+% make sure the visual display is in a
+% good shape.
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389a.tex b/test-cases/text-wrap/issue-389a.tex
new file mode 100644
index 00000000..7792605b
--- /dev/null
+++ b/test-cases/text-wrap/issue-389a.tex
@@ -0,0 +1 @@
+here is some leading text % This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
diff --git a/test-cases/text-wrap/issue-389b-mod1.tex b/test-cases/text-wrap/issue-389b-mod1.tex
new file mode 100644
index 00000000..1aff772b
--- /dev/null
+++ b/test-cases/text-wrap/issue-389b-mod1.tex
@@ -0,0 +1,12 @@
+here is some leading text another piece
+of text to be wrapped % This is a very
+% very long trailing comment that needs
+% to be wrapped by latexindent to make
+% sure the visual display is in a good
+% shape. Second comment: this is a very
+% very long trailing comment that needs
+% to be wrapped by latexindent to make
+% sure the visual display is in a good
+% shape.
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389b.tex b/test-cases/text-wrap/issue-389b.tex
new file mode 100644
index 00000000..b9583fc0
--- /dev/null
+++ b/test-cases/text-wrap/issue-389b.tex
@@ -0,0 +1,2 @@
+here is some leading text % This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+another piece of text to be wrapped % Second comment: this is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
diff --git a/test-cases/text-wrap/issue-389c-mod1.tex b/test-cases/text-wrap/issue-389c-mod1.tex
new file mode 100644
index 00000000..976ea0e1
--- /dev/null
+++ b/test-cases/text-wrap/issue-389c-mod1.tex
@@ -0,0 +1,14 @@
+\begin{abstract}
+	here is some leading text another piece
+	of text to be wrapped % This is a very
+	% very long trailing comment that needs
+	% to be wrapped by latexindent to make
+	% sure the visual display is in a good
+	% shape. Second comment: this is a very
+	% very long trailing comment that needs
+	% to be wrapped by latexindent to make
+	% sure the visual display is in a good
+	% shape.
+\end{abstract}
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389c-mod2.tex b/test-cases/text-wrap/issue-389c-mod2.tex
new file mode 100644
index 00000000..9df824db
--- /dev/null
+++ b/test-cases/text-wrap/issue-389c-mod2.tex
@@ -0,0 +1,15 @@
+\begin{abstract}
+    here is some leading text another
+    piece of text to be wrapped % This
+    % is a very very long trailing
+    % comment that needs to be wrapped
+    % by latexindent to make sure the
+    % visual display is in a good shape.
+    % Second comment: this is a very
+    % very long trailing comment that
+    % needs to be wrapped by latexindent
+    % to make sure the visual display is
+    % in a good shape.
+\end{abstract}
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389c.tex b/test-cases/text-wrap/issue-389c.tex
new file mode 100644
index 00000000..b20d5efb
--- /dev/null
+++ b/test-cases/text-wrap/issue-389c.tex
@@ -0,0 +1,4 @@
+\begin{abstract}
+here is some leading text % This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+another piece of text to be wrapped % Second comment: this is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+\end{abstract}
diff --git a/test-cases/text-wrap/issue-389d-mod1.tex b/test-cases/text-wrap/issue-389d-mod1.tex
new file mode 100644
index 00000000..bc5c4bdc
--- /dev/null
+++ b/test-cases/text-wrap/issue-389d-mod1.tex
@@ -0,0 +1,21 @@
+% This is a very very long trailing
+% comment that needs to be wrapped by
+% latexindent to make sure the visual
+% display is in a good shape. Second
+% comment Third is a very very long
+% trailing comment that needs to be
+% wrapped by latexindent to make sure
+% the visual display is in a good shape.
+% fourth comment 
+
+% This is a very very long trailing
+% comment that needs to be wrapped by
+% latexindent to make sure the visual
+% display is in a good shape. Second
+% comment Third is a very very long
+% trailing comment that needs to be
+% wrapped by latexindent to make sure
+% the visual display is in a good shape.
+% fourth comment 
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389d.tex b/test-cases/text-wrap/issue-389d.tex
new file mode 100644
index 00000000..fbfdb65a
--- /dev/null
+++ b/test-cases/text-wrap/issue-389d.tex
@@ -0,0 +1,10 @@
+% This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% Second comment 
+% Third is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% fourth comment 
+
+
+% This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% Second comment 
+% Third is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% fourth comment 
diff --git a/test-cases/text-wrap/issue-389e-mod1.tex b/test-cases/text-wrap/issue-389e-mod1.tex
new file mode 100644
index 00000000..c8d9709b
--- /dev/null
+++ b/test-cases/text-wrap/issue-389e-mod1.tex
@@ -0,0 +1,23 @@
+\begin{abstract}
+	% This is a very very long trailing
+	% comment that needs to be wrapped by
+	% latexindent to make sure the visual
+	% display is in a good shape. Second
+	% comment Third is a very very long
+	% trailing comment that needs to be
+	% wrapped by latexindent to make sure
+	% the visual display is in a good shape.
+	% fourth comment 
+
+	% This is a very very long trailing
+	% comment that needs to be wrapped by
+	% latexindent to make sure the visual
+	% display is in a good shape. Second
+	% comment Third is a very very long
+	% trailing comment that needs to be
+	% wrapped by latexindent to make sure
+	% the visual display is in a good shape.
+	% fourth comment 
+\end{abstract}
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389e-mod2.tex b/test-cases/text-wrap/issue-389e-mod2.tex
new file mode 100644
index 00000000..02447a42
--- /dev/null
+++ b/test-cases/text-wrap/issue-389e-mod2.tex
@@ -0,0 +1,23 @@
+\begin{abstract}
+    % This is a very very long trailing
+    % comment that needs to be wrapped
+    % by latexindent to make sure the
+    % visual display is in a good shape.
+    % Second comment Third is a very
+    % very long trailing comment that
+    % needs to be wrapped by latexindent
+    % to make sure the visual display is
+    % in a good shape. fourth comment 
+
+    % This is a very very long trailing
+    % comment that needs to be wrapped
+    % by latexindent to make sure the
+    % visual display is in a good shape.
+    % Second comment Third is a very
+    % very long trailing comment that
+    % needs to be wrapped by latexindent
+    % to make sure the visual display is
+    % in a good shape. fourth comment 
+\end{abstract}
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389e.tex b/test-cases/text-wrap/issue-389e.tex
new file mode 100644
index 00000000..88d686ab
--- /dev/null
+++ b/test-cases/text-wrap/issue-389e.tex
@@ -0,0 +1,12 @@
+\begin{abstract}
+% This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% Second comment 
+% Third is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% fourth comment 
+
+
+% This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% Second comment 
+% Third is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% fourth comment 
+\end{abstract}
diff --git a/test-cases/text-wrap/issue-389f-mod1.tex b/test-cases/text-wrap/issue-389f-mod1.tex
new file mode 100644
index 00000000..43c46369
--- /dev/null
+++ b/test-cases/text-wrap/issue-389f-mod1.tex
@@ -0,0 +1,7 @@
+text that isn't commented % This is a
+% very very long trailing comment that
+% needs to be wrapped by latexindent to
+% make sure the visual display is in a
+% good shape.
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389f.tex b/test-cases/text-wrap/issue-389f.tex
new file mode 100644
index 00000000..f68c2ed0
--- /dev/null
+++ b/test-cases/text-wrap/issue-389f.tex
@@ -0,0 +1 @@
+text that isn't commented % This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
diff --git a/test-cases/text-wrap/issue-389g-mod2.tex b/test-cases/text-wrap/issue-389g-mod2.tex
new file mode 100644
index 00000000..067bdcce
--- /dev/null
+++ b/test-cases/text-wrap/issue-389g-mod2.tex
@@ -0,0 +1,29 @@
+\begin{myenv}
+    \begin{abstract}
+        % This is a very very long
+        % trailing comment that needs to
+        % be wrapped by latexindent to
+        % make sure the visual display
+        % is in a good shape. Second
+        % comment Third is a very very
+        % long trailing comment that
+        % needs to be wrapped by
+        % latexindent to make sure the
+        % visual display is in a good
+        % shape. fourth comment 
+
+        % This is a very very long
+        % trailing comment that needs to
+        % be wrapped by latexindent to
+        % make sure the visual display
+        % is in a good shape. Second
+        % comment Third is a very very
+        % long trailing comment that
+        % needs to be wrapped by
+        % latexindent to make sure the
+        % visual display is in a good
+        % shape. fourth comment 
+    \end{abstract}
+\end{myenv}
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389g.tex b/test-cases/text-wrap/issue-389g.tex
new file mode 100644
index 00000000..b4233d72
--- /dev/null
+++ b/test-cases/text-wrap/issue-389g.tex
@@ -0,0 +1,14 @@
+\begin{myenv}
+\begin{abstract}
+% This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% Second comment 
+% Third is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% fourth comment 
+
+
+% This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% Second comment 
+% Third is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% fourth comment 
+\end{abstract}
+\end{myenv}
diff --git a/test-cases/text-wrap/issue-389h-mod2.tex b/test-cases/text-wrap/issue-389h-mod2.tex
new file mode 100644
index 00000000..e937e88d
--- /dev/null
+++ b/test-cases/text-wrap/issue-389h-mod2.tex
@@ -0,0 +1,7 @@
+% This is a very very long trailing
+% comment that needs to be wrapped by
+% latexindent to make sure the visual
+% display is in a good shape.
+text that isn't commented
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389h.tex b/test-cases/text-wrap/issue-389h.tex
new file mode 100644
index 00000000..f8ac8d4c
--- /dev/null
+++ b/test-cases/text-wrap/issue-389h.tex
@@ -0,0 +1,2 @@
+% This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+text that isn't commented
diff --git a/test-cases/text-wrap/issue-389i-mod2.tex b/test-cases/text-wrap/issue-389i-mod2.tex
new file mode 100644
index 00000000..c93329b4
--- /dev/null
+++ b/test-cases/text-wrap/issue-389i-mod2.tex
@@ -0,0 +1,7 @@
+text that isn't commented
+% This is a very very long trailing
+% comment that needs to be wrapped by
+% latexindent to make sure the visual
+% display is in a good shape
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389i.tex b/test-cases/text-wrap/issue-389i.tex
new file mode 100644
index 00000000..eee9a153
--- /dev/null
+++ b/test-cases/text-wrap/issue-389i.tex
@@ -0,0 +1,3 @@
+text that isn't commented
+% This is a very very long trailing comment that needs to be wrapped by
+% latexindent to make sure the visual display is in a good shape
diff --git a/test-cases/text-wrap/issue-389j-mod2.tex b/test-cases/text-wrap/issue-389j-mod2.tex
new file mode 100644
index 00000000..f6a7f8a4
--- /dev/null
+++ b/test-cases/text-wrap/issue-389j-mod2.tex
@@ -0,0 +1,21 @@
+%     This is a very very long trailing
+%     comment that needs to be wrapped
+%     by latexindent to make sure the
+%     visual display is in a good shape.
+%     Second comment Third is a very
+%     very long trailing comment that
+%     needs to be wrapped by latexindent
+%     to make sure the visual display is
+%     in a good shape. fourth comment 
+
+% This is a very very long trailing
+% comment that needs to be wrapped by
+% latexindent to make sure the visual
+% display is in a good shape. Second
+% comment Third is a very very long
+% trailing comment that needs to be
+% wrapped by latexindent to make sure
+% the visual display is in a good shape.
+% fourth comment 
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389j.tex b/test-cases/text-wrap/issue-389j.tex
new file mode 100644
index 00000000..2651a312
--- /dev/null
+++ b/test-cases/text-wrap/issue-389j.tex
@@ -0,0 +1,10 @@
+%     This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+%   Second comment 
+% Third is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% fourth comment 
+
+
+% This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% Second comment 
+% Third is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% fourth comment 
diff --git a/test-cases/text-wrap/issue-389k-mod2.tex b/test-cases/text-wrap/issue-389k-mod2.tex
new file mode 100644
index 00000000..ea6a5052
--- /dev/null
+++ b/test-cases/text-wrap/issue-389k-mod2.tex
@@ -0,0 +1,21 @@
+%This is a very very long trailing
+%comment that needs to be wrapped by
+%latexindent to make sure the visual
+%display is in a good shape. Second
+%comment Third is a very very long
+%trailing comment that needs to be
+%wrapped by latexindent to make sure the
+%visual display is in a good shape.
+%fourth comment 
+
+%  This is a very very long trailing
+%  comment that needs to be wrapped by
+%  latexindent to make sure the visual
+%  display is in a good shape. Second
+%  comment Third is a very very long
+%  trailing comment that needs to be
+%  wrapped by latexindent to make sure
+%  the visual display is in a good
+%  shape. fourth comment 
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389k.tex b/test-cases/text-wrap/issue-389k.tex
new file mode 100644
index 00000000..fc364b15
--- /dev/null
+++ b/test-cases/text-wrap/issue-389k.tex
@@ -0,0 +1,10 @@
+%This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+%   Second comment 
+% Third is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% fourth comment 
+
+
+%  This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% Second comment 
+% Third is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+% fourth comment 
diff --git a/test-cases/text-wrap/issue-389l-mod2.tex b/test-cases/text-wrap/issue-389l-mod2.tex
new file mode 100644
index 00000000..76e90d18
--- /dev/null
+++ b/test-cases/text-wrap/issue-389l-mod2.tex
@@ -0,0 +1,178 @@
+\begin{abstract}
+    This is a very long sentence that
+    should be wrapped at some point,
+    which is the case but is is is is
+    line width is not respected because
+    of the indentation.
+    Another is a very long sentence
+    that should be wrapped at some
+    point, which is the case but is is
+    is is line width is not respected
+    because of the indentation.
+    % This is a very very long trailing
+    % comment that needs to be wrapped
+    % by latexindent to make sure the
+    % visual display is in a good shape.
+    \begin{another}
+        Another is a very long sentence
+        that should be wrapped at some
+        point, which is the case but is
+        is is is line width is not
+        respected because of the
+        indentation.
+        \begin{itemize}
+            \item
+                  Another is a very
+                  long sentence that
+                  should be wrapped at
+                  some point, which is
+                  the case but is is is
+                  is line width is not
+                  respected because of
+                  the indentation.
+                  One is a very long
+                  sentence that should
+                  be wrapped at some
+                  point, which is the
+                  case but is is is is
+                  line width is not
+                  respected because of
+                  the indentation.
+                  Two is a very long
+                  sentence that should
+                  be wrapped at some
+                  point, which is the
+                  case but is is is is
+                  line width is not
+                  respected because of
+                  the indentation.
+                  % one is a very very
+                  % long trailing
+                  % comment that needs
+                  % to be wrapped by
+                  % latexindent to make
+                  % sure the visual
+                  % display is in a good
+                  % shape.
+            \item
+                  Another is a very
+                  long sentence that
+                  should be wrapped at
+                  some point, which is
+                  the case but is is is
+                  is line width is not
+                  respected because of
+                  the indentation.
+                  One is a very long
+                  sentence that should
+                  be wrapped at some
+                  point, which is the
+                  case but is is is is
+                  line width is not
+                  respected because of
+                  the indentation.
+                  Two is a very long
+                  sentence that should
+                  be wrapped at some
+                  point, which is the
+                  case but is is is is
+                  line width is not
+                  respected because of
+                  the indentation.
+                  % two is a very very
+                  % long trailing
+                  % comment that needs
+                  % to be wrapped by
+                  % latexindent to make
+                  % sure the visual
+                  % display is in a good
+                  % shape.
+            \item
+                  Another is a very
+                  long sentence that
+                  should be wrapped at
+                  some point, which is
+                  the case but is is is
+                  is line width is not
+                  respected because of
+                  the indentation.
+                  % three is a very very
+                  % long trailing
+                  % comment that needs
+                  % to be wrapped by
+                  % latexindent to make
+                  % sure the visual
+                  % display is in a good
+                  % shape.
+                  \begin{itemize}
+                      \item
+                            One is a
+                            very long
+                            sentence
+                            that should
+                            be wrapped
+                            at some
+                            point,
+                            which is
+                            the case
+                            but is is
+                            is is line
+                            width is
+                            not
+                            respected
+                            because of
+                            the
+                            indentation.
+                      \item
+                            Two is a
+                            very long
+                            sentence
+                            that should
+                            be wrapped
+                            at some
+                            point,
+                            which is
+                            the case
+                            but is is
+                            is is line
+                            width is
+                            not
+                            respected
+                            because of
+                            the
+                            indentation.
+                  \end{itemize}
+            \item
+                  Three is a very long
+                  sentence that should
+                  be wrapped at some
+                  point, which is the
+                  case but is is is is
+                  line width is not
+                  respected because of
+                  the indentation.
+        \end{itemize}
+    \end{another}
+    This is a very long sentence that
+    should be wrapped at some point,
+    which is the case but is is is is
+    line width is not respected because
+    of the indentation.
+    One is a very long sentence that
+    should be wrapped at some point,
+    which is the case but is is is is
+    line width is not respected because
+    of the indentation.
+    Two is a very long sentence that
+    should be wrapped at some point,
+    which is the case but is is is is
+    line width is not respected because
+    of the indentation.
+    Three is a very long sentence that
+    should be wrapped at some point,
+    which is the case but is is is is
+    line width is not respected because
+    of the indentation.
+\end{abstract}
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389l-mod3.tex b/test-cases/text-wrap/issue-389l-mod3.tex
new file mode 100644
index 00000000..237482db
--- /dev/null
+++ b/test-cases/text-wrap/issue-389l-mod3.tex
@@ -0,0 +1,178 @@
+\begin{abstract}
+	This is a very long sentence that
+	should be wrapped at some point,
+	which is the case but is is is is
+	line width is not respected because
+	of the indentation.
+	Another is a very long sentence
+	that should be wrapped at some
+	point, which is the case but is is
+	is is line width is not respected
+	because of the indentation.
+	% This is a very very long trailing
+	% comment that needs to be wrapped
+	% by latexindent to make sure the
+	% visual display is in a good shape.
+	\begin{another}
+		Another is a very long sentence
+		that should be wrapped at some
+		point, which is the case but is
+		is is is line width is not
+		respected because of the
+		indentation.
+		\begin{itemize}
+			\item
+			      Another is a very
+			      long sentence that
+			      should be wrapped at
+			      some point, which is
+			      the case but is is is
+			      is line width is not
+			      respected because of
+			      the indentation.
+			      One is a very long
+			      sentence that should
+			      be wrapped at some
+			      point, which is the
+			      case but is is is is
+			      line width is not
+			      respected because of
+			      the indentation.
+			      Two is a very long
+			      sentence that should
+			      be wrapped at some
+			      point, which is the
+			      case but is is is is
+			      line width is not
+			      respected because of
+			      the indentation.
+			      % one is a very very
+			      % long trailing
+			      % comment that needs
+			      % to be wrapped by
+			      % latexindent to make
+			      % sure the visual
+			      % display is in a good
+			      % shape.
+			\item
+			      Another is a very
+			      long sentence that
+			      should be wrapped at
+			      some point, which is
+			      the case but is is is
+			      is line width is not
+			      respected because of
+			      the indentation.
+			      One is a very long
+			      sentence that should
+			      be wrapped at some
+			      point, which is the
+			      case but is is is is
+			      line width is not
+			      respected because of
+			      the indentation.
+			      Two is a very long
+			      sentence that should
+			      be wrapped at some
+			      point, which is the
+			      case but is is is is
+			      line width is not
+			      respected because of
+			      the indentation.
+			      % two is a very very
+			      % long trailing
+			      % comment that needs
+			      % to be wrapped by
+			      % latexindent to make
+			      % sure the visual
+			      % display is in a good
+			      % shape.
+			\item
+			      Another is a very
+			      long sentence that
+			      should be wrapped at
+			      some point, which is
+			      the case but is is is
+			      is line width is not
+			      respected because of
+			      the indentation.
+			      % three is a very very
+			      % long trailing
+			      % comment that needs
+			      % to be wrapped by
+			      % latexindent to make
+			      % sure the visual
+			      % display is in a good
+			      % shape.
+			      \begin{itemize}
+				      \item
+				            One is a
+				            very long
+				            sentence
+				            that should
+				            be wrapped
+				            at some
+				            point,
+				            which is
+				            the case
+				            but is is
+				            is is line
+				            width is
+				            not
+				            respected
+				            because of
+				            the
+				            indentation.
+				      \item
+				            Two is a
+				            very long
+				            sentence
+				            that should
+				            be wrapped
+				            at some
+				            point,
+				            which is
+				            the case
+				            but is is
+				            is is line
+				            width is
+				            not
+				            respected
+				            because of
+				            the
+				            indentation.
+			      \end{itemize}
+			\item
+			      Three is a very long
+			      sentence that should
+			      be wrapped at some
+			      point, which is the
+			      case but is is is is
+			      line width is not
+			      respected because of
+			      the indentation.
+		\end{itemize}
+	\end{another}
+	This is a very long sentence that
+	should be wrapped at some point,
+	which is the case but is is is is
+	line width is not respected because
+	of the indentation.
+	One is a very long sentence that
+	should be wrapped at some point,
+	which is the case but is is is is
+	line width is not respected because
+	of the indentation.
+	Two is a very long sentence that
+	should be wrapped at some point,
+	which is the case but is is is is
+	line width is not respected because
+	of the indentation.
+	Three is a very long sentence that
+	should be wrapped at some point,
+	which is the case but is is is is
+	line width is not respected because
+	of the indentation.
+\end{abstract}
+----|----|----|----|----|----|----|----|
+   5   10   15   20   25   30   35   40
\ No newline at end of file
diff --git a/test-cases/text-wrap/issue-389l.tex b/test-cases/text-wrap/issue-389l.tex
new file mode 100644
index 00000000..e4e891db
--- /dev/null
+++ b/test-cases/text-wrap/issue-389l.tex
@@ -0,0 +1,17 @@
+\begin{abstract}
+    This is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation.  Another is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation. % This is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+    \begin{another}
+    Another is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation.
+    \begin{itemize}
+      \item Another is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation. One is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation. Two is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation.% one is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+      \item Another is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation. One is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation. Two is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation.% two is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+      \item Another is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation.% three is a very very long trailing comment that needs to be wrapped by latexindent to make sure the visual display is in a good shape.
+    \begin{itemize}
+      \item One is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation.
+      \item Two is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation.
+    \end{itemize}
+      \item Three is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation.
+    \end{itemize}
+    \end{another}
+    This is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation. One is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation. Two is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation. Three is a very long sentence that should be wrapped at some point, which is the case but is is is is line width is not respected because of the indentation.
+\end{abstract}
diff --git a/test-cases/text-wrap/text-wrap-remove-PLB.sh b/test-cases/text-wrap/text-wrap-remove-PLB.sh
index 538b02a0..e5a792e3 100755
--- a/test-cases/text-wrap/text-wrap-remove-PLB.sh
+++ b/test-cases/text-wrap/text-wrap-remove-PLB.sh
@@ -195,6 +195,9 @@ latexindent.pl -s -r -m -l issue-359a.yaml issue-359a.tex -y 'modifyLineBreaks:t
 latexindent.pl -s -r -m -l issue-359a.yaml issue-359b.tex -y 'modifyLineBreaks:textWrapOptions:columns:60' -o=+-mod3
 latexindent.pl -s -r -m -l issue-359a.yaml issue-359c.tex -y 'modifyLineBreaks:textWrapOptions:columns:60' -o=+-mod3
 
+latexindent.pl -s -r -m -l issue-359d.yaml issue-359a.tex -y 'modifyLineBreaks:textWrapOptions:columns:60' -o=+-mod5
+latexindent.pl -s -r -m -l issue-359e.yaml issue-359a.tex -y 'modifyLineBreaks:textWrapOptions:columns:60' -o=+-mod6
+
 # sentence text wrapping
 latexindent.pl -s -r -m -l issue-359b.yaml issue-359.tex -o=+-mod3
 latexindent.pl -s -r -m -l issue-359b.yaml issue-359a.tex -o=+-mod4
@@ -208,6 +211,34 @@ latexindent.pl -s -r -m -l issue-359c.yaml issue-359e.tex -o=+-mod2
 latexindent.pl -s -r -m -l issue-356.yaml,addruler3.yaml issue-356.tex -o=+-mod1
 latexindent.pl -s -r -m -l issue-356a.yaml,addruler3.yaml issue-356.tex -o=+-mod2
 
+# wrap comments
+latexindent.pl -s -r -m -l wrap-comments.yaml,addruler1.yaml issue-389a.tex -o=+-mod1
+latexindent.pl -s -r -m -l wrap-comments.yaml,addruler1.yaml issue-389b.tex -o=+-mod1
+
+latexindent.pl -s -r -m -l wrap-comments.yaml,addruler1.yaml issue-389c.tex -o=+-mod1
+latexindent.pl -s -r -m -l wrap-comments2.yaml,addruler1.yaml issue-389c.tex -o=+-mod2
+
+latexindent.pl -s -r -m -l wrap-comments.yaml,addruler1.yaml issue-389d.tex -o=+-mod1
+
+latexindent.pl -s -r -m -l wrap-comments.yaml,addruler1.yaml issue-389e.tex -o=+-mod1
+latexindent.pl -s -r -m -l wrap-comments2.yaml,addruler1.yaml issue-389e.tex -o=+-mod2
+
+latexindent.pl -s -r -m -l wrap-comments3.yaml,addruler1.yaml issue-389f.tex -o=+-mod1
+
+latexindent.pl -s -r -m -l wrap-comments2.yaml,addruler1.yaml issue-389g.tex -o=+-mod2
+
+latexindent.pl -s -r -m -l wrap-comments2.yaml,addruler1.yaml issue-389h.tex -o=+-mod2
+
+latexindent.pl -s -r -m -l wrap-comments2.yaml,addruler1.yaml issue-389i.tex -o=+-mod2
+
+latexindent.pl -s -r -m -l wrap-comments2.yaml,addruler1.yaml,inherit-leading-space.yaml issue-389j.tex -o=+-mod2
+
+latexindent.pl -s -r -m -l wrap-comments2.yaml,addruler1.yaml,inherit-leading-space.yaml issue-389k.tex -o=+-mod2
+
+# sentences with trailing comments
+latexindent.pl -s -r -m -l wrap-comments4.yaml,addruler1.yaml issue-389l.tex -o=+-mod2
+latexindent.pl -s -r -m -l wrap-comments5.yaml,addruler1.yaml issue-389l.tex -o=+-mod3
+
 set +x
 [[ $gitStatus == 1 ]] && git status
 [[ $noisyMode == 1 ]] && makenoise
diff --git a/test-cases/text-wrap/wrap-comments.yaml b/test-cases/text-wrap/wrap-comments.yaml
new file mode 100644
index 00000000..fa6909ac
--- /dev/null
+++ b/test-cases/text-wrap/wrap-comments.yaml
@@ -0,0 +1,7 @@
+modifyLineBreaks:
+  textWrapOptions:
+    columns: 40
+    comments: 
+      wrap: 1   
+    blocksFollow:
+      other: \\begin\{(?:abstract)\}
diff --git a/test-cases/text-wrap/wrap-comments2.yaml b/test-cases/text-wrap/wrap-comments2.yaml
new file mode 100644
index 00000000..a2870fcc
--- /dev/null
+++ b/test-cases/text-wrap/wrap-comments2.yaml
@@ -0,0 +1,9 @@
+defaultIndent: '    '
+modifyLineBreaks:
+  textWrapOptions:
+    columns: 40
+    when: after
+    comments: 
+      wrap: 1
+    blocksFollow:
+      other: \\begin\{(?:abstract)\}
diff --git a/test-cases/text-wrap/wrap-comments3.yaml b/test-cases/text-wrap/wrap-comments3.yaml
new file mode 100644
index 00000000..2fed5721
--- /dev/null
+++ b/test-cases/text-wrap/wrap-comments3.yaml
@@ -0,0 +1,7 @@
+defaultIndent: '    '
+modifyLineBreaks:
+  textWrapOptions:
+    columns: 40
+    when: after
+    comments: 
+      wrap: 1
diff --git a/test-cases/text-wrap/wrap-comments4.yaml b/test-cases/text-wrap/wrap-comments4.yaml
new file mode 100644
index 00000000..b294ccf1
--- /dev/null
+++ b/test-cases/text-wrap/wrap-comments4.yaml
@@ -0,0 +1,14 @@
+defaultIndent: '    '
+modifyLineBreaks:
+  oneSentencePerLine:
+    manipulateSentences: 1
+    textWrapSentences: 1
+    sentencesFollow:
+        other: \\item
+  textWrapOptions:
+    columns: 40
+    when: after
+    comments: 
+      wrap: 1
+    blocksFollow:
+      other: \\begin\{(?:abstract)\}
diff --git a/test-cases/text-wrap/wrap-comments5.yaml b/test-cases/text-wrap/wrap-comments5.yaml
new file mode 100644
index 00000000..90d744bb
--- /dev/null
+++ b/test-cases/text-wrap/wrap-comments5.yaml
@@ -0,0 +1,14 @@
+defaultIndent: "\t"
+modifyLineBreaks:
+  oneSentencePerLine:
+    manipulateSentences: 1
+    textWrapSentences: 1
+    sentencesFollow:
+        other: \\item
+  textWrapOptions:
+    columns: 40
+    when: after
+    comments: 
+      wrap: 1
+    blocksFollow:
+      other: \\begin\{(?:abstract)\}