changed PeerInfo to have more useful fields
merged stuff