more cleanup; prep for make dist