added map and more charts