more data plus proper shapefiles