more shuffling
minor tweaks and rearrangements