updated cleanup again

this time i think it runs in *most* cases
made a minor change to cleanup

this printout is a little nicer