River generation and improved pathfinding