improved and largely working peer_map*.go