fix bug in diagnostics, and add more peers to closer peer responses