more p2p stuff