more refinements to diagnostics...