Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs
===================================================================
diff -u -r1649 -r1686
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 1649)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 1686)
@@ -35,46 +35,17 @@
     /// </summary>
     public class SensorLocation
     {
-        #region Business Rules
+        private SensorGroup sensorGroup;
 
         /// <summary>
-        /// Specication to test if the value of the candidate is valid
-        /// </summary>
-//        internal class IgnoreOrLocationData : PredicateSpecification<DataSourceTypeSensors>
-//        {
-//            public IgnoreOrLocationData()
-//                : base(x => x == DataSourceTypeSensors.Ignore || x == DataSourceTypeSensors.LocationData)
-//            {
-//                Description = "Only Ignore or LocationData value allowed for this property.";
-//            }
-//        }
-
-        /// <summary>
-        /// Specication to test if the value of the candidate is valid
-        /// </summary>
-//        internal class SensorOrLocationData : PredicateSpecification<DataSourceTypeSensors>
-//        {
-//            public SensorOrLocationData()
-//                : base(x => x == DataSourceTypeSensors.Sensor || x == DataSourceTypeSensors.LocationData)
-//            {
-//                Description = "Only Sensor or LocationData value allowed for this property.";
-//            }
-//        }
-
-        #endregion
-
-        /// <summary>
         /// Constructor is needed for XML deserialization
         /// </summary>
-        
         public SensorLocation()
         {
             SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
             SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
         }
 
-        private SensorGroup sensorGroup;
-
         /// <summary>
         /// Gets the PL line offset below dike top at river.
         /// </summary>
@@ -113,7 +84,6 @@
         /// <value>
         /// The location.
         /// </value>
-       // [Specification(typeof(NotNullSpecification))]
         public Location Location { get; set; }
 
         /// <summary>
@@ -134,7 +104,6 @@
         /// <value>
         /// The sensorGroup.
         /// </value>
-      //  [Specification(typeof(NotNullSpecification))]
         public SensorGroup SensorGroup
         {
             get { return sensorGroup; }
@@ -191,7 +160,6 @@
         /// <value>
         /// The Pl3.
         /// </value>
-     //   [Specification(typeof(SensorOrLocationData))]
         public DataSourceTypeSensors SourceTypePl3 { get; set; }
 
         /// <summary>
@@ -200,17 +168,14 @@
         /// <value>
         /// The Pl4.
         /// </value>
-     //   [Specification(typeof(SensorOrLocationData))]
         public DataSourceTypeSensors SourceTypePl4 { get; set; }
 
-
         /// <summary>
         /// Gets or sets the outer water level data source type.
         /// </summary>
         /// <value>
         /// The outer water level.
         /// </value>
-     //   [Specification(typeof(SensorOrLocationData))]
         public DataSourceTypeSensors SourceTypePl1WaterLevelAtRiver { get; set; }
 
         /// <summary>
@@ -219,7 +184,6 @@
         /// <value>
         /// Data source type for Pl1 PLLine offset below dike top at river.
         /// </value>
- //       [Specification(typeof(IgnoreOrLocationData))]
         public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeTopAtRiver { get; set; }
 
         /// <summary>
@@ -228,7 +192,6 @@
         /// <value>
         /// The Pl1 PL line offset below dike top at polder.
         /// </value>
-   //     [Specification(typeof(IgnoreOrLocationData))]
         public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeTopAtPolder { get; set; }
 
         /// <summary>
@@ -237,7 +200,6 @@
         /// <value>
         /// The Pl1 PL line offset below shoulder base inside.
         /// </value>
-     //   [Specification(typeof(IgnoreOrLocationData))]
         public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowShoulderBaseInside { get; set; }
 
         /// <summary>
@@ -246,7 +208,6 @@
         /// <value>
         /// The Pl1 PL line offset below dike toe at polder.
         /// </value>
-        //[Specification(typeof(IgnoreOrLocationData))]
         public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeToeAtPolder { get; set; }
 
         /// <summary>
@@ -255,7 +216,6 @@
         /// <value>
         /// The Pl1 polder level.
         /// </value>
-        //[Specification(typeof(SensorOrLocationData))]
         public DataSourceTypeSensors SourceTypePl1WaterLevelAtPolder { get; set; }
 
         /// <summary>
@@ -319,14 +279,6 @@
         }
 
         /// <summary>
-        /// Gets or sets the alias.
-        /// </summary>
-        /// <value>
-        /// The alias.
-        /// </value>
-        public string Alias { get; set; } // ToDo Tom/Kin Sun Waarvoor nodig? Wordt nergens gebruikt. Kan gewoon weg!?
-
-        /// <summary>
         /// Gets or sets the profile.
         /// </summary>
         /// <value>
@@ -339,10 +291,10 @@
         }
 
         /// <summary>
-        /// Gets or sets the m stab file.
+        /// Gets or sets the MStab file.
         /// </summary>
         /// <value>
-        /// The m stab file.
+        /// The MStab file.
         /// </value>
         public string MStabFile  
         {
@@ -430,7 +382,7 @@
         }
 
         /// <summary>
-        /// Gets the value.
+        /// Gets the sensor value.
         /// </summary>
         /// <param name="expression">The expression.</param>
         /// <param name="sensorValues">The sensor values.</param>
@@ -517,17 +469,6 @@
         }
 
         /// <summary>
-        /// Determines whether this instance is valid.
-        /// </summary>
-        /// <returns>
-        ///   <c>true</c> if this instance is valid; otherwise, <c>false</c>.
-        /// </returns>
-//        public bool IsValid()
-//        {
-//            return !Validator.Validate(this).Any();
-//        }
-
-        /// <summary>
         /// Gets or sets the GetGroups function (injectable list, for UI purposes).
         /// </summary>
         /// <value>
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs
===================================================================
diff -u -r1624 -r1686
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 1624)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 1686)
@@ -1193,7 +1193,6 @@
             return translationTable[timeStepUnit];
         }
 
-
         /// <summary>
         /// Constants for translating to Enums PlLineType
         /// </summary>
@@ -1275,12 +1274,15 @@
             return translationTable[sensorType];
         }
 
+        /// <summary>
+        /// Constants for translating to Enums DataSourceTypeSensors
+        /// </summary>
         public const uint DataSourceTypeSensorsIgnore = 0;
         public const uint DataSourceTypeSensorsLocationData = 1;
         public const uint DataSourceTypeSensorsSensor = 2;
 
         /// <summary>
-        /// Converts the Dam DataSourceType to input DataSourceTypeSensors.
+        /// Converts the Dam DataSourceTypeSensors to input DataSourceTypeSensors.
         /// </summary>
         /// <param name="dataSourceTypeSensors">The data source type sensors.</param>
         /// <returns>
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs
===================================================================
diff -u -r1670 -r1686
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs	(.../DamEngineRunner.cs)	(revision 1670)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/DamEngineRunner.cs	(.../DamEngineRunner.cs)	(revision 1686)
@@ -144,6 +144,9 @@
             }
         }
 
+        /// <summary>
+        /// Runs this instance.
+        /// </summary>
         public void Run()
         {
             Initialize();
@@ -258,6 +261,7 @@
                 LogManager.Add(new LogMessage(LogMessageType.FatalError, typeof(EngineInterface), string.Format("{0}", e.Message)));
             }
         }
+
         protected void WriteResultsToFile(string fileName)
         {
             if (string.IsNullOrWhiteSpace(fileName))
@@ -276,6 +280,7 @@
                 Logger.LogError("Could not export Fews xml file", e);
             }
         }
+
         /// <summary>
         /// Reads the user settings of the slip circle definition.
         /// </summary>
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r1614 -r1686
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 1614)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 1686)
@@ -137,10 +137,10 @@
         }
 
         /// <summary>
-        /// Gets a value indicating whether this instance has sensor data.
+        /// Gets a value indicating whether this instance has a sensor location.
         /// </summary>
         /// <value>
-        ///   <c>true</c> if this instance has sensor data; otherwise, <c>false</c>.
+        ///   <c>true</c> if this instance has a sensor location; otherwise, <c>false</c>.
         /// </value>
         public bool HasSensorLocation
         {
@@ -151,10 +151,10 @@
         }
 
         /// <summary>
-        /// Gets or sets the sensor data.
+        /// Gets or sets the sensor location.
         /// </summary>
         /// <value>
-        /// The sensor data.
+        /// The sensor location.
         /// </value>
         public virtual SensorLocation SensorLocation
         {
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorRepository.cs
===================================================================
diff -u -r1676 -r1686
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorRepository.cs	(.../SensorRepository.cs)	(revision 1676)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorRepository.cs	(.../SensorRepository.cs)	(revision 1686)
@@ -88,7 +88,6 @@
             return SensorGroup.Selection.GetUniqueID(x => x.ID);
         }
 
-
         /// <summary>
         /// Adds the collection of sensors to the sensorGroup.
         /// </summary>
@@ -140,26 +139,5 @@
             names.Add(sensor.Name);
             sensorLocation.SensorGroup.Add(sensor);
         }
-
-        /// <summary>
-        /// Serializes the state of this repository to a XML string.
-        /// </summary>
-        /// <returns></returns>
-        internal string Serialize()
-        {
-            throw new NotImplementedException();
-            // return sensorLocation.Serialize();
-        }
-
-        /// <summary>
-        /// Deserializes the specified XML to restore the state of this repository
-        /// </summary>
-        /// <param name="xml">The XML.</param>
-        internal static SensorRepository Deserialize(string xml)
-        {
-            throw new NotImplementedException();
-//            if (string.IsNullOrWhiteSpace(xml)) throw new ArgumentException("xml");
-//            return new SensorRepository() { sensorLocation = SensorLocation.Deserialize(xml) };
-        }
     }
 }
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs
===================================================================
diff -u -r1613 -r1686
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 1613)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 1686)
@@ -1264,12 +1264,15 @@
             return translationTable[sensorType];
         }
 
+        /// <summary>
+        /// Constants for translating to Enums DataSourceTypeSensors
+        /// </summary>
         public const uint DataSourceTypeSensorsIgnore = 0;
         public const uint DataSourceTypeSensorsLocationData = 1;
         public const uint DataSourceTypeSensorsSensor = 2;
 
         /// <summary>
-        /// Converts the Dam DataSourceType to input DataSourceTypeSensors.
+        /// Converts the Dam DataSourceTypeSensors to input DataSourceTypeSensors.
         /// </summary>
         /// <param name="dataSourceTypeSensors">The data source type sensors.</param>
         /// <returns>
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs
===================================================================
diff -u -r1669 -r1686
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 1669)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs	(.../SensorLocation.cs)	(revision 1686)
@@ -412,6 +412,19 @@
             internal static readonly string PL4 = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl4);
         }
 
+        /// <summary>
+        /// Gets the requested sensor value.
+        /// </summary>
+        /// <param name="expression">The expression.</param>
+        /// <param name="sensorValues">The sensor values.</param>
+        /// <param name="sensor">The sensor.</param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException">
+        /// sensorValues
+        /// or
+        /// sensor
+        /// </exception>
+        /// <exception cref="ArgumentException">The given sensor is not an item/key in the table of sensor values</exception>
         public double? GetValue(Expression<Func<SensorLocation, object>> expression, IDictionary<Sensor, double> sensorValues, Sensor sensor)
         {
             if (sensorValues == null) throw new ArgumentNullException("sensorValues");