fixes
updates and rearrangements