Index: doc/conf.py
===================================================================
diff -u -r4eebd1e4de8f1a4bcc97ad344596f04d7b045a4b -r355b418d3f7a680059d2a00e25e7f6fbbb6dfdd9
--- doc/conf.py	(.../conf.py)	(revision 4eebd1e4de8f1a4bcc97ad344596f04d7b045a4b)
+++ doc/conf.py	(.../conf.py)	(revision 355b418d3f7a680059d2a00e25e7f6fbbb6dfdd9)
@@ -16,7 +16,7 @@
 #import sphinx_rtd_theme
 
 html_theme = "sphinxdoc"
-
+#html_theme = "agogo"
 html_theme_path = ["."]
 
 from mock import Mock as MagicMock
Index: doc/index.rst
===================================================================
diff -u -r0fc7439329d0ea7ec14ea9360d97a18ebbcf82c0 -r355b418d3f7a680059d2a00e25e7f6fbbb6dfdd9
--- doc/index.rst	(.../index.rst)	(revision 0fc7439329d0ea7ec14ea9360d97a18ebbcf82c0)
+++ doc/index.rst	(.../index.rst)	(revision 355b418d3f7a680059d2a00e25e7f6fbbb6dfdd9)
@@ -34,10 +34,11 @@
 OpenStreams project (http://www.openstreams.nl). Wflow consists of a
 set of python programs that can be run on the command line and perform
 hydrological simulations. The models are based on the PCRaster python
-framework. In wflow this framework is extended (the ``wf_DynamicFramework``
+framework (www.pcraster.eu). In wflow this framework is extended (the ``wf_DynamicFramework``
 class) so that models build using the framework can be controlled using
-the API. Links to OpenMI (www.openmi.org), BMI and OpenDA (www.openda.org)
-are being tested.
+the API. Links to BMI and OpenDA (www.openda.org)
+have been established. All code is available at github (https://github.com/openstreams/wflow/)
+and distributed under the GPL version 3.0.
 
 The  wflow distributed hydrological model platform currently includes
 the following models:
@@ -48,9 +49,10 @@
 
 -  the wflow\_gr4 model (a distributed version of the gr4h/d models).
 
--  the wflow\_W3RA model.
+-  the wflow\_W3RA model (a global hydrological model)
 
--  the wflow\_routing model (a kinematic wave model that can run on the output of tone of the hydrological models).
+-  the wflow\_routing model (a kinematic wave model that can run on the output of one of the hydrological models
+   optionally including a floodplain for more realistic simulations in areas that flood).
 
 -  the wflow\_wave model (a dynamic wave model that can run on the output of the wflow\_routing model).
 
@@ -109,7 +111,7 @@
 transparent, can be changed by other modellers easily, and the system
 allows for rapid development. In order to run
 the model both PCRaster 4.* and Python 2.7 are needed. At the moment
-only 64 bit versions are supported.
+only 64 bit versions are actively supported.
 
 
 
Index: doc/wflow_hbv.rst
===================================================================
diff -u -r934e81e3af5db3b226cf5e66a9c4ace3fe47990b -r355b418d3f7a680059d2a00e25e7f6fbbb6dfdd9
--- doc/wflow_hbv.rst	(.../wflow_hbv.rst)	(revision 934e81e3af5db3b226cf5e66a9c4ace3fe47990b)
+++ doc/wflow_hbv.rst	(.../wflow_hbv.rst)	(revision 355b418d3f7a680059d2a00e25e7f6fbbb6dfdd9)
@@ -381,7 +381,7 @@
 
 
 Subcatchment flow
-=================
+-----------------
 Normally the the kinematic wave is continuous throughout the model. By using the
 the SubCatchFlowOnly entry in the model section of the ini file all flow is at the
 subcatchment only and no flow is transferred from one subcatchment to another. This can be handy
Index: doc/wflow_routing.rst
===================================================================
diff -u -rf6a174037a258e9427bb2155eb988f8a840aa97b -r355b418d3f7a680059d2a00e25e7f6fbbb6dfdd9
--- doc/wflow_routing.rst	(.../wflow_routing.rst)	(revision f6a174037a258e9427bb2155eb988f8a840aa97b)
+++ doc/wflow_routing.rst	(.../wflow_routing.rst)	(revision 355b418d3f7a680059d2a00e25e7f6fbbb6dfdd9)
@@ -4,7 +4,7 @@
 
 Introduction
 ------------
-The wflow routing module uses the pcraster kinematic wave to route water over a DEM. By adding a bankflull level
+The wflow routing module uses the pcraster kinematic wave to route water over a DEM. By adding a bankfull level
 and a floodplainwidth to the configuration the model can also include estimated flow over a floodplain.
 
 Method
@@ -122,6 +122,22 @@
 -------------
 The default name for the file is wflow\_routing.ini.
 
+Subcatchment flow
+~~~~~~~~~~~~~~~~~
+Normally the the kinematic wave is continuous throughout the model. By using the
+the SubCatchFlowOnly entry in the model section of the ini file all flow is at the
+subcatchment only and no flow is transferred from one subcatchment to another. This can be handy
+when connecting the result of the model to a water allocation model such as Ribasim.
+
+Example:
+
+::
+
+    [model]
+    SubCatchFlowOnly = 1
+
+
+
 Forcing data
 ~~~~~~~~~~~~
 
Index: wflow-py/wflow/wflow_routing.py
===================================================================
diff -u -radd65e2f3f0e848e03d5b4f45ab1b4e057e5a2d8 -r355b418d3f7a680059d2a00e25e7f6fbbb6dfdd9
--- wflow-py/wflow/wflow_routing.py	(.../wflow_routing.py)	(revision add65e2f3f0e848e03d5b4f45ab1b4e057e5a2d8)
+++ wflow-py/wflow/wflow_routing.py	(.../wflow_routing.py)	(revision 355b418d3f7a680059d2a00e25e7f6fbbb6dfdd9)
@@ -502,7 +502,7 @@
 
     def dynamic(self):
         """
-        Stuf that is done for each timestep
+        Stuff that is done for each timestep
 
         Below a list of variables that can be save to disk as maps or as
         timeseries (see ini file for syntax):