Updated RouteRiverCells and Finalize_SFR2 for efficiency
Minor bugfixes