Better peer identification

Just for review. I will not be merging these changes into my master branch.
Why would you need to have this hostname separately maintained apart from the friend{i}.hostname{i} ?