more cleanup; no time to finish it tonight