some more diags… houskeeping
this should now be close to alpha version, phew