Minor text changes and rearrangements