More careful reset of heartbeat timer
Revert "Fixing incorrect persistent of peers to avoid local address"

This reverts commit fb565c30858c06f395afc4893067516975ff417f.
Fixing peer number calculations