cleanup and fixes for commoncpp peering...