Better peer identification

Done.