[WIP] Peerfinder consolidate timers, faster autoconnect