Improving River Simulation