more cleanup, a few items remaining, hard parts done