added keyword search/retrieve, rename PeerDriver to P2PDriver