Add peersetRand, and other small fall through modifications