Small changes... to improve the maps