Better peer identification

Just for review. I will not be merging these changes into my master branch.