Small changes and rearrangements.