Minor fixes and rearrangement.