misc rearrangements