improved map and dialog system