a few simple changes, having trouble with peer_names