Rearrangements
Various updates