Added new ones. Considering turning InfoWindow off