added peer record and infos
manual merge