fix map, add some friends