All kinds of semi improvements to the map