shapefile is almost ok now