Update roads and rivers
Add rivers and swamps
Add names
Improve rivers
Add swamps
Improve swamps accuracy
Fix multipolygon geometry