More work in network config and some on the map