further p2p stuff