cleaned up threading management, going back to P2P service advertisement