Fixed map, added infowindow back in