more cleanup revisions, some diagnostics