work on map and other fine tuning