Added the map functionality and some more tooltips