handled join more gracefully, in order to fix issue #2
(m) cleaned up Peer header