comments, minor adjustments, rearrangements