move the sources, add some fix on the map
Continue fix the map