Index: wflow-py/UnitTests/wflow_sceleton/outstate/TSoil.map
===================================================================
diff -u -r34c2b30d41c043c3a36fb6b265acea8484cd201e -r7cdea110c122f40854a89284f90ae55ba6fac6f4
Binary files differ
Index: wflow-py/UnitTests/wflow_sceleton/wflow_sceleton.ini
===================================================================
diff -u -rffc095b905619eaa31ac87f1063a673ca5cdf7a5 -r7cdea110c122f40854a89284f90ae55ba6fac6f4
--- wflow-py/UnitTests/wflow_sceleton/wflow_sceleton.ini	(.../wflow_sceleton.ini)	(revision ffc095b905619eaa31ac87f1063a673ca5cdf7a5)
+++ wflow-py/UnitTests/wflow_sceleton/wflow_sceleton.ini	(.../wflow_sceleton.ini)	(revision 7cdea110c122f40854a89284f90ae55ba6fac6f4)
@@ -1,7 +1,57 @@
+#[API]
+#TEMP=0,degrees
+#P=0,1
 [API]
-TEMP=0,degrees
-P=0,1
+IF = 0,1
+InwaterMM = 2,4
 
+#states
+CanopyStorage = 2, mm
+FirstZoneDepth  = 2, mm
+LowerZoneStorage = 2, mm
+Snow = 2, mm
+SnowWater = 2, mm
+SurfaceRunoff = 2, m^3/s
+SurfaceRunoffDyn = 2, m^3/s
+TSoil = 2, oC
+UStoreDepth = 2, mm
+WaterLevel = 2, m
+WaterLevelDyn = 2, m
+
+# fluxes 
+PotTransSoil = 1, mm/timestep
+Transpiration = 1, mm/timestep
+ActEvapOpenWater = 1, mm/timestep
+soilevap = 1, mm/timestep
+Interception = 1, mm/timestep
+ActEvap = 1, mm/timestep
+SurfaceRunoffCatchmentMM = 1, mm/timestep
+ActEvap = 1, mm/timestep
+ExcessWater = 1, mm/timestep
+InfiltExcess = 1, mm/timestep
+ActInfilt = 1, mm/timestep
+zi = 1, mm/timestep
+TSoil = 1, oC
+Transfer = 1, mm/timestep
+CapFlux = 1, mm/timestep
+RunoffCoeff = 1, -
+
+# parameters
+#Soil
+M = 0, - 
+thetaR = 0, mm/mm 
+thetaS = 0, mm/mm
+FirstZoneKsatVer = 0, mm/timestep
+PathFrac = 0, -
+InfiltCapSoil = 0, mm/timestep
+InfiltCapPath = 0, mm/timestep
+FirstZoneMinCapacity = 0, mm
+FirstZoneCapacity = 0, mm
+RootingDepth = 0, mm
+MaxLeakage = 0, mm/timestep
+CapScale = 0, mm/timestep
+RunoffGeneratingGWPerc = 0, -
+rootdistpar = 0, mm
 [model]
 
 [framework]
Index: wflow-py/wflow/wflow_hbv.py
===================================================================
diff -u -r5385d1348fedf28159307fb2e3fe97260e4ed036 -r7cdea110c122f40854a89284f90ae55ba6fac6f4
--- wflow-py/wflow/wflow_hbv.py	(.../wflow_hbv.py)	(revision 5385d1348fedf28159307fb2e3fe97260e4ed036)
+++ wflow-py/wflow/wflow_hbv.py	(.../wflow_hbv.py)	(revision 7cdea110c122f40854a89284f90ae55ba6fac6f4)
@@ -130,10 +130,9 @@
   
   
   """
-  The user defined model class. All maps are defined here for documentation 
-  purposes
-    
-  
+  The user defined model class.
+
+
   """
   
   
@@ -147,9 +146,7 @@
       self.configfile = configfile
       self.SaveDir = os.path.join(self.Dir,self.runId)
 
-        
-  
-      
+
   def updateRunOff(self):
       """
       Updates the kinematic wave reservoir
@@ -395,7 +392,7 @@
     
     
      # Temperature correction per cell to add
-    self.TempCor=self.wf_readmap(os.path.join(self.Dir , configget(self.config,"model","TemperatureCorrectionMap","staticmapswflow_tempcor.map")),0.0)
+    self.TempCor=self.wf_readmap(os.path.join(self.Dir , configget(self.config,"model","TemperatureCorrectionMap","staticmap/swflow_tempcor.map")),0.0)
  
                       
     if self.scalarInput:
@@ -908,7 +905,7 @@
     ## Main model starts here
     ########################################################################
     try:
-        opts, args = getopt.getopt(argv, 'c:QXS:F:hC:Ii:T:NR:u:s:P:p:Xx:U:fl:')
+        opts, args = getopt.getopt(argv, 'c:QXS:F:hC:Ii:T:R:u:s:P:p:Xx:U:fl:L:')
     except getopt.error, msg:
         pcrut.usage(msg)
     
@@ -962,7 +959,6 @@
         if o == '-x': configset(myModel.config,'model','sCatch',a,overwrite=True)
         if o == '-c': configset(myModel.config,'model','configfile', a,overwrite=True)
         if o == '-M': configset(myModel.config,'model','MassWasting',"0",overwrite=True)
-        if o == '-N': configset(myModel.config,'model','nolateral','1',overwrite=True) 
         if o == '-Q': configset(myModel.config,'model','ExternalQbase','1',overwrite=True)
         if o == '-U': 
             configset(myModel.config,'model','updateFile',a,overwrite=True)