peer leave, peer join fixes