Peer generator hookup and label fixes to play nice with WS.