a little cleanup, ready for first run
more band-aids