Small initial fixes and rearrangements.