added infowindow and more