improved diagnostics table