First chunk of fixups.
more cleanup.