peer2peer and publish subscribe touch up