Peer-to-peer fixes; work in progress