improved manual diagnostics