Better peer identification

Done