diff --git a/Annex60/Controls/Continuous/Examples/OffTimer.mo b/Annex60/Controls/Continuous/Examples/OffTimer.mo
index ff13fb9989..8d93ce9653 100644
--- a/Annex60/Controls/Continuous/Examples/OffTimer.mo
+++ b/Annex60/Controls/Continuous/Examples/OffTimer.mo
@@ -36,6 +36,7 @@ Annex60.Controls.Continuous.OffTimer</a>.
 The input to the two timers are alternating boolean values.
 Whenever the input becomes <code>false(=0)</code>, the timer is reset.
 The figures below show the input and output of the blocks.
+</p>
 <p align=\"center\">
 <img src=\"modelica://Annex60/Resources/Images/Controls/Continuous/Examples/OffTimer1.png\" border=\"1\" alt=\"Input and output of the OffTimer offTim1.\"/><br/>
 <img src=\"modelica://Annex60/Resources/Images/Controls/Continuous/Examples/OffTimer2.png\" border=\"1\" alt=\"Input and output of the OffTimer offTim1.\"/>
diff --git a/Annex60/Controls/Continuous/Examples/PIDHysteresisTimer.mo b/Annex60/Controls/Continuous/Examples/PIDHysteresisTimer.mo
index ccf463549d..6eded504d8 100644
--- a/Annex60/Controls/Continuous/Examples/PIDHysteresisTimer.mo
+++ b/Annex60/Controls/Continuous/Examples/PIDHysteresisTimer.mo
@@ -89,6 +89,7 @@ and the system has little heat capacity.
 The figure below shows the control error
 <code>con.feeBac.y</code> and the control signal
 <code>con.y</code>.
+</p>
 <p align=\"center\">
 <img src=\"modelica://Annex60/Resources/Images/Controls/Continuous/Examples/PIDHysteresisTimerError.png\" border=\"1\" alt=\"Control error.\"/><br/>
 <img src=\"modelica://Annex60/Resources/Images/Controls/Continuous/Examples/PIDHysteresisTimerOutput.png\" border=\"1\" alt=\"Control signal.\"/>
diff --git a/Annex60/Controls/Continuous/Examples/SignalRanker.mo b/Annex60/Controls/Continuous/Examples/SignalRanker.mo
index e77c8e55e4..5491f30269 100644
--- a/Annex60/Controls/Continuous/Examples/SignalRanker.mo
+++ b/Annex60/Controls/Continuous/Examples/SignalRanker.mo
@@ -27,9 +27,10 @@ Example that demonstrates the use of the signal ranker model.
 The figure below shows the input and output signals of the block.
 Note that
 <code>sigRan.y[1] &ge; sigRan.y[2] &ge; sigRan.y[3]</code>.
+</p>
 <p align=\"center\">
 <img src=\"modelica://Annex60/Resources/Images/Controls/Continuous/Examples/SignalRankerU.png\" border=\"1\" alt=\"Input to signal ranker.\"/><br/>
-		  <img src=\"modelica://Annex60/Resources/Images/Controls/Continuous/Examples/SignalRankerY.png\" border=\"1\" alt=\"Output of signal ranker.\"/>
+<img src=\"modelica://Annex60/Resources/Images/Controls/Continuous/Examples/SignalRankerY.png\" border=\"1\" alt=\"Output of signal ranker.\"/>
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Annex60/Controls/Continuous/NumberOfRequests.mo b/Annex60/Controls/Continuous/NumberOfRequests.mo
index 9734f715f6..51c31141cb 100644
--- a/Annex60/Controls/Continuous/NumberOfRequests.mo
+++ b/Annex60/Controls/Continuous/NumberOfRequests.mo
@@ -44,7 +44,7 @@ Block that outputs the number of inputs that exceed a threshold.
 The parameter <code>kind</code> is used to determine the kind of the
 inequality. The table below shows the allowed settings.
 </p>
-<table border=\"1\" cellspacing=0 cellpadding=2 style=\"border-collapse:collapse;\" summary=\"Allowed parameter settings.\">
+<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\" summary=\"Allowed parameter settings.\">
 <tr>
 <th>Value of parameter <code>kind</code></th>
 <th>Output signal incremented by 1 for each <i>i &isin; {1, ..., nin}</i> if</th>
diff --git a/Annex60/Controls/Continuous/PIDHysteresisTimer.mo b/Annex60/Controls/Continuous/PIDHysteresisTimer.mo
index 746c88646f..6538017196 100644
--- a/Annex60/Controls/Continuous/PIDHysteresisTimer.mo
+++ b/Annex60/Controls/Continuous/PIDHysteresisTimer.mo
@@ -240,6 +240,7 @@ Annex60.Controls.Continuous.PIDHysteresis</a> but in addition,
 it has a timer that prevents the controller from switching to on
 too fast. When the controller switches off, the timer starts and
 avoids the controller from switching on until <code>minOffTime</code> seconds elapsed.
+</p>
 </html>", revisions="<html>
 <ul>
 <li>
diff --git a/Annex60/Controls/Continuous/SignalRanker.mo b/Annex60/Controls/Continuous/SignalRanker.mo
index e6e098dc3a..cf6193dfc6 100644
--- a/Annex60/Controls/Continuous/SignalRanker.mo
+++ b/Annex60/Controls/Continuous/SignalRanker.mo
@@ -19,11 +19,12 @@ defaultComponentName="sigRan",
 Documentation(info="<html>
 <p>
 Block that sorts the input signal <code>u[:]</code> such that the output
-signal satisfies <code>y[i] >= y[i+1]</code> for all <code>i=1, ..., nin-1</code>.
+signal satisfies <code>y[i] &gt;= y[i+1]</code> for all <code>i=1, ..., nin-1</code>.
 </p>
 <p>
 This block may for example be used in a variable air volume flow
 controller to access the position of the dampers that are most open.
+</p>
 </html>",
 revisions="<html>
 <ul>
diff --git a/Annex60/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo b/Annex60/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
index aaf8127dbe..f4045f06fa 100644
--- a/Annex60/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
+++ b/Annex60/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
@@ -45,7 +45,7 @@ partial model PartialThreeWayValve "Partial three way valve"
     annotation(Dialog(group="Nominal condition"));
 
   parameter Real fraK(min=0, max=1) = 0.7
-    "Fraction Kv(port_3->port_2)/Kv(port_1->port_2)";
+    "Fraction Kv(port_3&rarr;port_2)/Kv(port_1&rarr;port_2)";
   parameter Real[2] l(each min=0, each max=1) = {0, 0}
     "Valve leakage, l=Kv(y=0)/Kv(y=1)";
   parameter Real deltaM = 0.02
@@ -158,15 +158,15 @@ with different opening characteristics, such as linear, equal percentage
 or quick opening. The three way valve model consists of a mixer where
 valves are placed in two of the flow legs. The third flow leg
 has no friction.
-The flow coefficient <code>Kv</code> for flow from <code>port_1 -> port_2</code> is
+The flow coefficient <code>Kv</code> for flow from <code>port_1 &rarr; port_2</code> is
 a parameter.
-The flow coefficient for the bypass flow from <code>port_3 -> port_2</code>
+The flow coefficient for the bypass flow from <code>port_3 &rarr; port_2</code>
 is computed as
 </p>
 <pre>
-         Kv(port_3 -> port_2)
+         Kv(port_3 &rarr; port_2)
   fraK = ----------------------
-         Kv(port_1 -> port_2)
+         Kv(port_1 &rarr; port_2)
 </pre>
 <p>
 where <code>0 &lt; fraK &le; 1</code> is a parameter with a default value
@@ -188,8 +188,8 @@ parameter has the attribute <code>fixed=false</code> for some values
 of <code>CvData</code>. In this case, assigning a value is not allowed.
 Corrected wrong documentation of parameter <code>fraK(min=0, max=1) = 0.7</code>.
 The documenation was
-<i>Fraction Kv(port_1->port_2)/Kv(port_3->port_2)</i> instead of
-<i>Fraction Kv(port_3->port_2)/Kv(port_1->port_2)</i>.
+<i>Fraction Kv(port_1&rarr;port_2)/Kv(port_3&rarr;port_2)</i> instead of
+<i>Fraction Kv(port_3&rarr;port_2)/Kv(port_1&rarr;port_2)</i>.
 Because the parameter set correctly its attributes <code>min=0</code> and <code>max=1</code>,
 instances of this model used the correct value.
 </li>
diff --git a/Annex60/Fluid/Actuators/BaseClasses/ValveParameters.mo b/Annex60/Fluid/Actuators/BaseClasses/ValveParameters.mo
index 5c8e40c951..69f3ddd9cc 100644
--- a/Annex60/Fluid/Actuators/BaseClasses/ValveParameters.mo
+++ b/Annex60/Fluid/Actuators/BaseClasses/ValveParameters.mo
@@ -80,10 +80,10 @@ Modelica.Fluid</a>
 to specify the valve flow coefficient in fully open conditions:
 </p>
 <ul>
-<li><code>CvData = Annex60.Fluid.Types.CvTypes.Av</code>: the flow coefficient is given by the metric <code>Av</code> coefficient (m^2).
-<li><code>CvData = Annex60.Fluid.Types.CvTypes.Kv</code>: the flow coefficient is given by the metric <code>Kv</code> coefficient (m^3/h).
-<li><code>CvData = Annex60.Fluid.Types.CvTypes.Cv</code>: the flow coefficient is given by the US <code>Cv</code> coefficient (USG/min).
-<li><code>CvData = Annex60.Fluid.Types.CvTypes.OpPoint</code>: the flow is computed from the nominal operating point specified by <code>dp_nominal</code> and <code>m_flow_nominal</code>.
+<li><code>CvData = Annex60.Fluid.Types.CvTypes.Av</code>: the flow coefficient is given by the metric <code>Av</code> coefficient (m^2).</li>
+<li><code>CvData = Annex60.Fluid.Types.CvTypes.Kv</code>: the flow coefficient is given by the metric <code>Kv</code> coefficient (m^3/h).</li>
+<li><code>CvData = Annex60.Fluid.Types.CvTypes.Cv</code>: the flow coefficient is given by the US <code>Cv</code> coefficient (USG/min).</li>
+<li><code>CvData = Annex60.Fluid.Types.CvTypes.OpPoint</code>: the flow is computed from the nominal operating point specified by <code>dp_nominal</code> and <code>m_flow_nominal</code>.</li>
 </ul>
 <p>
 The treatment of parameters <code>Kv</code> and <code>Cv</code> is
diff --git a/Annex60/Fluid/Actuators/Dampers/Exponential.mo b/Annex60/Fluid/Actuators/Dampers/Exponential.mo
index 35e99862a2..6fcabbd2ee 100755
--- a/Annex60/Fluid/Actuators/Dampers/Exponential.mo
+++ b/Annex60/Fluid/Actuators/Dampers/Exponential.mo
@@ -45,6 +45,7 @@ differentiable in <i>y</i> and the derivative is continuous.
 <p>
 The damper characteristics <i>k<sub>d</sub>(y)</i> is then used to
 compute the flow coefficient <i>k(y)</i> as
+</p>
 <p align=\"center\" style=\"font-style:italic;\">
 k(y) = (2 &rho; &frasl; k<sub>d</sub>(y))<sup>1/2</sup> A,
 </p>
@@ -61,7 +62,8 @@ with regularization near the origin.
 </p>
 <p>
 ASHRAE 825-RP lists the following parameter values as typical:
-<table summary=\"summary\" border=\"1\" cellspacing=0 cellpadding=2 style=\"border-collapse:collapse;\">
+</p>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
 <tr>
 <td></td><th>opposed blades</th><th>single blades</th>
 </tr>
diff --git a/Annex60/Fluid/Actuators/Valves/Examples/TwoWayValveTable.mo b/Annex60/Fluid/Actuators/Valves/Examples/TwoWayValveTable.mo
index 0b6b1208bd..a75a6474be 100644
--- a/Annex60/Fluid/Actuators/Valves/Examples/TwoWayValveTable.mo
+++ b/Annex60/Fluid/Actuators/Valves/Examples/TwoWayValveTable.mo
@@ -108,7 +108,7 @@ opening characteristics.
 The valve has the following opening characteristics, which is taken from a test case
 of the IEA EBC Annex 60 project.
 </p>
-<table summary=\"summary\" border=\"1\" cellspacing=0 cellpadding=2 style=\"border-collapse:collapse;\">
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
 <tr><td><i>y</i></td>
   <td>0</td>  <td>0.1667</td>  <td>0.3333</td>  <td>0.5</td>  <td>0.6667</td>  <td>1</td>
 </tr>
diff --git a/Annex60/Fluid/Actuators/Valves/TwoWayTable.mo b/Annex60/Fluid/Actuators/Valves/TwoWayTable.mo
index a5dc6e193d..58542f8853 100644
--- a/Annex60/Fluid/Actuators/Valves/TwoWayTable.mo
+++ b/Annex60/Fluid/Actuators/Valves/TwoWayTable.mo
@@ -57,7 +57,7 @@ scaled by the values of the parameter
 <code>flowCharacteristics</code>.
 The parameter <code>flowCharacteristics</code> declares a table of the form
 </p>
-<table summary=\"summary\" border=\"1\" cellspacing=0 cellpadding=2 style=\"border-collapse:collapse;\">
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
 <tr>
 <td><i>y</i></td>  <td>0</td>  <td>...</td>  <td>1</td>
 </tr>
diff --git a/Annex60/Fluid/BaseClasses/PartialThreeWayResistance.mo b/Annex60/Fluid/BaseClasses/PartialThreeWayResistance.mo
index 4836419ca5..981269372a 100644
--- a/Annex60/Fluid/BaseClasses/PartialThreeWayResistance.mo
+++ b/Annex60/Fluid/BaseClasses/PartialThreeWayResistance.mo
@@ -122,6 +122,7 @@ If <code>dynamicBalance=true</code>, then at the junction of the three flows,
 a mixing volume will be present. This will introduce a dynamic energy and momentum
 balance, which often breaks algebraic loops.
 The time constant of the mixing volume is determined by the parameter <code>tau</code>.
+</p>
 </html>", revisions="<html>
 <ul>
 <li>
diff --git a/Annex60/Fluid/HeatExchangers/Examples/Heater_T.mo b/Annex60/Fluid/HeatExchangers/Examples/Heater_T.mo
index 5e02431932..3daad6adec 100644
--- a/Annex60/Fluid/HeatExchangers/Examples/Heater_T.mo
+++ b/Annex60/Fluid/HeatExchangers/Examples/Heater_T.mo
@@ -47,6 +47,7 @@ See
 <a href=\"modelica://Annex60.Fluid.HeatExchangers.Examples.Heater_u\">
 Annex60.Fluid.HeatExchangers.Examples.Heater_u</a>
 for a model that takes the heating power as an input.
+</p>
 </html>", revisions="<html>
 <ul>
 <li>
diff --git a/Annex60/Fluid/HeatExchangers/Examples/Heater_u.mo b/Annex60/Fluid/HeatExchangers/Examples/Heater_u.mo
index 2b5c2172e9..aababd2647 100644
--- a/Annex60/Fluid/HeatExchangers/Examples/Heater_u.mo
+++ b/Annex60/Fluid/HeatExchangers/Examples/Heater_u.mo
@@ -39,6 +39,7 @@ See
 <a href=\"modelica://Annex60.Fluid.HeatExchangers.Examples.Heater_T\">
 Annex60.Fluid.HeatExchangers.Examples.Heater_T</a>
 for a model that takes the leaving air temperature as an input.
+</p>
 </html>", revisions="<html>
 <ul>
 <li>
diff --git a/Annex60/Fluid/Interfaces/Examples/PrescribedOutletState.mo b/Annex60/Fluid/Interfaces/Examples/PrescribedOutletState.mo
index edc9b8de66..37e79fc41c 100644
--- a/Annex60/Fluid/Interfaces/Examples/PrescribedOutletState.mo
+++ b/Annex60/Fluid/Interfaces/Examples/PrescribedOutletState.mo
@@ -136,6 +136,7 @@ Model that demonstrates the use of an ideal heater and an ideal cooler.
 <p>
 The heater model has an almost unlimited positive capacity (<code>Q_flow_nominal = 1.0e10</code> Watts),
 and hence its outlet temperature always reaches the set point temperatures.
+</p>
 <p>
 The cooler model has a limited negative capacitiy (<code>Q_flow_nominal = 1000</code> Watts), and hence
 its outlet temperature reaches only a limited value corresponding to its
diff --git a/Annex60/Fluid/Interfaces/PartialFourPortInterface.mo b/Annex60/Fluid/Interfaces/PartialFourPortInterface.mo
index 5459c55b83..377c60b311 100644
--- a/Annex60/Fluid/Interfaces/PartialFourPortInterface.mo
+++ b/Annex60/Fluid/Interfaces/PartialFourPortInterface.mo
@@ -72,6 +72,7 @@ It is similar to
 <a href=\"modelica://Annex60.Fluid.Interfaces.PartialTwoPortInterface\">
 Annex60.Fluid.Interfaces.PartialTwoPortInterface</a>,
 but it has four ports instead of two.
+</p>
 <p>
 The model is used by other models in this package that add heat transfer,
 mass transfer and pressure drop equations.
diff --git a/Annex60/Fluid/Interfaces/PrescribedOutletState.mo b/Annex60/Fluid/Interfaces/PrescribedOutletState.mo
index 43b9c7c9b4..0fb81006ab 100644
--- a/Annex60/Fluid/Interfaces/PrescribedOutletState.mo
+++ b/Annex60/Fluid/Interfaces/PrescribedOutletState.mo
@@ -165,7 +165,7 @@ equation
           extent={{48,102},{92,74}},
           lineColor={0,0,127},
           textString="Q_flow")}),
-  Documentation(info="<HTML>
+  Documentation(info="<html>
 <p>
 This model sets the temperature of the medium that leaves <code>port_a</code>
 to the value given by the input <code>TSet</code>, subject to optional
diff --git a/Annex60/Fluid/Interfaces/package.mo b/Annex60/Fluid/Interfaces/package.mo
index 1c5ce8d906..63691427b1 100644
--- a/Annex60/Fluid/Interfaces/package.mo
+++ b/Annex60/Fluid/Interfaces/package.mo
@@ -33,7 +33,7 @@ These define parameters that are needed by many fluid flow components.
 Next, we describe the basic classes. For a more detailed description,
 see the <i>info</i> section of the class.
 </p>
-<table summary=\"summary\" border=\"1\" cellspacing=0 cellpadding=2 style=\"border-collapse:collapse;\">
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
 <tr>
 <!-- ============================================== -->
   <td><a href=\"modelica://Annex60.Fluid.Interfaces.ConservationEquation\">
diff --git a/Annex60/Fluid/MixingVolumes/Examples/MixingVolumeSteadyStateMass.mo b/Annex60/Fluid/MixingVolumes/Examples/MixingVolumeSteadyStateMass.mo
new file mode 100644
index 0000000000..9f96d6bf08
--- /dev/null
+++ b/Annex60/Fluid/MixingVolumes/Examples/MixingVolumeSteadyStateMass.mo
@@ -0,0 +1,84 @@
+within Annex60.Fluid.MixingVolumes.Examples;
+model MixingVolumeSteadyStateMass "Test model for steady state mass dynamics"
+  extends Modelica.Icons.Example;
+  package Medium = Annex60.Experimental.Media.AirPTDecoupled;
+  Sources.MassFlowSource_T sou(
+    redeclare package Medium = Medium,
+    use_m_flow_in=true,
+    nPorts=1) "Flow source and sink"
+    annotation (Placement(transformation(extent={{-20,-20},{0,0}})));
+  Sources.Boundary_pT bou(
+    redeclare package Medium = Medium,
+    nPorts=1) "Boundary condition"
+    annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=180,
+        origin={92,-10})));
+  Annex60.Fluid.MixingVolumes.MixingVolume vol(
+    V=1,
+    redeclare package Medium = Medium,
+    m_flow_nominal=0.01,
+    massDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    allowFlowReversal=true,
+    prescribedHeatFlowRate=false,
+    nPorts=2,
+    mSenFac=2,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
+    "Mixing volume with steady state mass dynamics"
+     annotation (Placement(transformation(extent={{30,20},{50,40}})));
+  Modelica.Blocks.Sources.Ramp ramp(
+    duration=1,
+    offset=1,
+    height=-2) "Ramp input"
+    annotation (Placement(transformation(extent={{-90,-20},{-70,0}})));
+
+  Modelica.Blocks.Math.Gain gain(k=0.01) "Gain for nominal mass flow rate"
+    annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
+  FixedResistances.FixedResistanceDpM res(
+    redeclare package Medium = Medium,
+    m_flow_nominal=0.01,
+    dp_nominal=1000) "Pressure drop"
+    annotation (Placement(transformation(extent={{50,-20},{70,0}})));
+equation
+  connect(ramp.y, gain.u) annotation (Line(
+      points={{-69,-10},{-62,-10}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(gain.y, sou.m_flow_in) annotation (Line(
+      points={{-39,-10},{-31.5,-10},{-31.5,-2},{-20,-2}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(sou.ports[1], vol.ports[1]) annotation (Line(
+      points={{0,-10},{38,-10},{38,20}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(vol.ports[2], res.port_a) annotation (Line(
+      points={{42,20},{42,-10},{50,-10}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  connect(res.port_b, bou.ports[1]) annotation (Line(
+      points={{70,-10},{82,-10}},
+      color={0,127,255},
+      smooth=Smooth.None));
+  annotation (Documentation(
+        info="<html>
+<p>
+This model shows that steady state mass dynamics are correctly simulated. 
+A change in pressure does not lead to an exchange and/or creation of mass. 
+The mixing volume temperature is also unaffected by a pressure change.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 9, 2015 by Filip Jorissen:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+experiment(StopTime=1.0),
+__Dymola_Commands(file=
+          "modelica://Annex60/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumeSteadyStateMass.mos"
+        "Simulate and plot"),
+    Diagram(graphics));
+end MixingVolumeSteadyStateMass;
diff --git a/Annex60/Fluid/Movers/Data/FlowControlled.mo b/Annex60/Fluid/Movers/Data/FlowControlled.mo
index 74489b047d..8530798215 100644
--- a/Annex60/Fluid/Movers/Data/FlowControlled.mo
+++ b/Annex60/Fluid/Movers/Data/FlowControlled.mo
@@ -65,9 +65,7 @@ Annex60.Fluid.Movers.SpeedControlled_Nrpm</a>,
 use the record
 <a href=\"modelica://Annex60.Fluid.Movers.Data.Generic_Nrpm\">
 Annex60.Fluid.Movers.Data.Generic_Nrpm</a>
-
-
-
+</p>
 </html>",
 revisions="<html>
 <ul>
diff --git a/Annex60/Fluid/Movers/SpeedControlled_Nrpm.mo b/Annex60/Fluid/Movers/SpeedControlled_Nrpm.mo
index 4123775677..72a3ed309a 100644
--- a/Annex60/Fluid/Movers/SpeedControlled_Nrpm.mo
+++ b/Annex60/Fluid/Movers/SpeedControlled_Nrpm.mo
@@ -11,9 +11,10 @@ model SpeedControlled_Nrpm
             motorCooledByFluid=per.motorCooledByFluid,
             use_powerCharacteristic=per.use_powerCharacteristic));
 
-  parameter Data.SpeedControlled_Nrpm per "Record with performance data"
+  replaceable parameter Data.SpeedControlled_Nrpm per
+    "Record with performance data"
     annotation (choicesAllMatching=true,
-      Placement(transformation(extent={{60,-80},{80,-60}})));
+      Placement(transformation(extent={{20,-80},{40,-60}})));
 
   Modelica.Blocks.Interfaces.RealInput Nrpm(unit="1/min")
     "Prescribed rotational speed"
@@ -84,6 +85,11 @@ User's Guide</a> for more information.
       revisions="<html>
 <ul>
 <li>
+March 6, 2015, by Michael Wetter<br/>
+Made performance record <code>per</code> replaceable
+as for the other models.
+</li>      
+<li>
 January 6, 2015, by Michael Wetter:<br/>
 Revised model for OpenModelica.
 </li>
diff --git a/Annex60/Fluid/Movers/UsersGuide.mo b/Annex60/Fluid/Movers/UsersGuide.mo
index 5044ec299f..b00a797d90 100644
--- a/Annex60/Fluid/Movers/UsersGuide.mo
+++ b/Annex60/Fluid/Movers/UsersGuide.mo
@@ -22,7 +22,7 @@ electrical power draw and efficiency as a function
 of the volume flow rate and the speed.
 The following performance curves are implemented:
 </p>
-<table summary=\"summary\" border=\"1\" cellspacing=0 cellpadding=2 style=\"border-collapse:collapse;\">
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
 <tr>
 <th>Independent variable</th>
 <th>Dependent variable</th>
@@ -70,7 +70,7 @@ Note that not all records can be used with all models, as
 the records only declare the minimum set of required data.
 </p>
 <!-- Table for performance data -->
-<table summary=\"Performance data\" border=\"1\" cellspacing=0 cellpadding=2 style=\"border-collapse:collapse;\">
+<table summary=\"Performance data\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
 <tr>
 <th></th>
 <th style=\"text-align:left\">
@@ -149,7 +149,7 @@ Annex60.Fluid.Movers.BaseClasses.Characteristics.pressure</a>.
 For example, suppose a pump needs to be modeled whose pressure versus flow relation crosses, at
 full speed, the points shown in the table below.
 </p>
-  <table summary=\"summary\" border=\"1\" cellspacing=0 cellpadding=2 style=\"border-collapse:collapse;\">
+  <table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
   <tr>
       <th>Volume flow rate [m<sup>3</sup>&frasl;h] </th>
       <th>Head [Pa]</th>
diff --git a/Annex60/Fluid/Sensors/UsersGuide.mo b/Annex60/Fluid/Sensors/UsersGuide.mo
index c20ce4131f..c81560e6b7 100644
--- a/Annex60/Fluid/Sensors/UsersGuide.mo
+++ b/Annex60/Fluid/Sensors/UsersGuide.mo
@@ -32,7 +32,7 @@ For an explanation, see
 Modelica.Fluid.Examples.Explanatory.MeasuringTemperature</a>.
 </p>
 
-<table summary=\"summary\" border=\"1\" cellspacing=0 cellpadding=2>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
 <tr><th valign=\"top\" align=\"left\">Correct use</th>
     <td valign=\"top\">
     <img alt=\"image\" src=\"modelica://Annex60/Resources/Images/Fluid/Sensors/twoPortHex.png\" />
@@ -76,7 +76,7 @@ ports can be used for all connection topologies.
 <p>
 The table below summarizes the recommendations for the use of sensors.
 </p>
-<table summary=\"summary\" border=\"1\" cellspacing=0 cellpadding=2>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
 <tr><th rowspan=\"2\" valign=\"top\">Measured quantity</th>
     <th rowspan=\"2\" valign=\"top\">One port sensor</th>
     <th colspan=\"2\" valign=\"top\">Two port sensor</th>
diff --git a/Annex60/Fluid/Sources/TraceSubstancesFlowSource.mo b/Annex60/Fluid/Sources/TraceSubstancesFlowSource.mo
index 56a876d905..5b55b141e1 100644
--- a/Annex60/Fluid/Sources/TraceSubstancesFlowSource.mo
+++ b/Annex60/Fluid/Sources/TraceSubstancesFlowSource.mo
@@ -58,6 +58,7 @@ carbon dioxide concentration is typically so small that it need not be
 added to the room mass balance, and since the mass flow rate can be
 made small compared to the room volume if the medium that leaves this
 component has a carbon dioxide concentration of <i>1</i>.
+</p>
 </html>", revisions="<html>
 <ul>
 <li>
diff --git a/Annex60/Fluid/package.mo b/Annex60/Fluid/package.mo
index ffd8ce47ce..bbb873720b 100644
--- a/Annex60/Fluid/package.mo
+++ b/Annex60/Fluid/package.mo
@@ -34,7 +34,7 @@ Modelica.Fluid.Interfaces.FluidPort</a>.
 Fluid ports declare the variables listed in the table below.
 </p>
 
-<table summary=\"summary\" border=\"1\" cellspacing=0 cellpadding=2 style=\"border-collapse:collapse;\">
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
 <tr>
 <th>Variable</th>
 <th>Description</th>
@@ -73,7 +73,7 @@ Fluid ports declare the variables listed in the table below.
       Users who need to access the actual enthalpy for the given flow
       direction can do so using the sensor
       <a href=\"modelica://Annex60.Fluid.Sensors.SpecificEnthalpyTwoPort\">
-      Annex60.Fluid.Sensors.SpecificEnthalpyTwoPort</a>.
+      Annex60.Fluid.Sensors.SpecificEnthalpyTwoPort</a>.</td>
 </tr>
 <tr>
   <td><code>Xi_outflow[Medium.nXi]</code></td>
@@ -167,7 +167,7 @@ mass and energy balance equations.
 For the mass balance, the following configurations can be selected:
 </p>
 
-<table summary=\"summary\" border=\"1\" cellspacing=0 cellpadding=2 style=\"border-collapse:collapse;\">
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
 <tr>
 <th>Parameter</th>
 <th>Initialization problem<br/>
@@ -231,7 +231,7 @@ where <code>Medium</code> is the medium model.
 <p>
 Similarly, for the energy balance, the following configurations can be selected:
 </p>
-<table summary=\"summary\" border=\"1\" cellspacing=0 cellpadding=2 style=\"border-collapse:collapse;\">
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
 <tr>
 <th>Parameter</th>
 <th>Initialization problem</th>
@@ -309,7 +309,7 @@ parameters are used differently, and the respective model documentation or code
 should be consulted for details. However, the table below shows typical use of
 parameters in various model to help the user understand how they are used.
 </p>
-<table summary=\"summary\" border=\"1\" cellspacing=0 cellpadding=2 style=\"border-collapse:collapse;\">
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
 <tr>
 <th>Parameter</th>
 <th>Model</th>
diff --git a/Annex60/Media/Air.mo b/Annex60/Media/Air.mo
index b84521cd58..65461dd89d 100644
--- a/Annex60/Media/Air.mo
+++ b/Annex60/Media/Air.mo
@@ -274,6 +274,7 @@ This function computes the specific entropy.
 </p>
 <p>
 The specific entropy of the mixture is obtained from
+</p>
 <p align=\"center\" style=\"font-style:italic;\">
 s = s<sub>s</sub> + s<sub>m</sub>,
 </p>
@@ -286,6 +287,7 @@ of the dry air and water vapor.
 </p>
 <p>
 The entropy change due to change in state is obtained from
+</p>
 <p align=\"center\" style=\"font-style:italic;\">
 s<sub>s</sub> = c<sub>v</sub> ln(T/T<sub>0</sub>) + R ln(v/v<sub>0</sub>) <br/>
 = c<sub>v</sub> ln(T/T<sub>0</sub>) + R ln(&rho;<sub>0</sub>/&rho;)
diff --git a/Annex60/Resources/ReferenceResults/Dymola/Annex60_Fluid_MixingVolumes_Examples_MixingVolumeSteadyStateMass.txt b/Annex60/Resources/ReferenceResults/Dymola/Annex60_Fluid_MixingVolumes_Examples_MixingVolumeSteadyStateMass.txt
new file mode 100644
index 0000000000..28099e1ada
--- /dev/null
+++ b/Annex60/Resources/ReferenceResults/Dymola/Annex60_Fluid_MixingVolumes_Examples_MixingVolumeSteadyStateMass.txt
@@ -0,0 +1,6 @@
+last-generated=2015-03-09
+vol.dynBal.m=[1.20000004768371582031, 1.20000004768371582031]
+time=[0.00000000000000000000, 1.00000000000000000000]
+vol.T=[293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000, 293.14999389648437500000]
+vol.ports[2].m_flow=[-0.00999999977648258209, -0.00980000011175867491, -0.00960000044703476947, -0.00939999985098829982, -0.00920000018626438223, -0.00899999962747108188, -0.00879999992549399500, -0.00860000029802314089, -0.00839999966472450635, -0.00820000011175910787, -0.00800000040978140516, -0.00779999977648265438, -0.00760000007450550592, -0.00739999990686832001, -0.00719999988824135753, -0.00700000033527540567, -0.00680000001862605171, -0.00659999999999978312, -0.00639999998137434807, -0.00620000013038489364, -0.00600000011175834749, -0.00579999979510982793, -0.00559999977648272668, -0.00540000022351691273, -0.00519999990686839230, -0.00499999988824129105, -0.00480000003725183661, -0.00460000031664837584, -0.00439999999999985542, -0.00419999968335133499, -0.00400000042840694108, -0.00380000011175842022, -0.00359999979510989936, -0.00340000030733486180, -0.00319999999068675727, -0.00299999990686777070, -0.00280000018626444871, -0.00260000010244546128, -0.00240000001862647342, -0.00219999970197684233, -0.00200000021420347011, -0.00179999989755474216, -0.00159999969732098780, -0.00140000009313222436, -0.00120000000931323671, -0.00099999980907892745, -0.00080000014668302340, -0.00060000000465665370, -0.00039999977531894756, -0.00020000018568204714, 0.00000000000000000000, 0.00020000018567920501, 0.00040000037135854880, 0.00060000060069273628, 0.00079999955064460210, 0.00099999980908248125, 0.00120000000931252742, 0.00140000009313009151, 0.00160000029336155886, 0.00180000049359302599, 0.00199999961816496033, 0.00219999970198110585, 0.00240000001862789459, 0.00260000010244404011, 0.00280000018626018520, 0.00300000050290697437, 0.00319999939465131795, 0.00339999971129505401, 0.00359999979511203220, 0.00380000011175912972, 0.00400000042840338750, 0.00420000027939277515, 0.00439999940396554150, 0.00459999972060677956, 0.00480000003725467896, 0.00499999988824129105, 0.00520000020488697000, 0.00540000052153264895, 0.00560000037252370107, 0.00579999949709480295, 0.00599999981374048190, 0.00620000013038418413, 0.00639999998137221523, 0.00660000029801622885, 0.00680000061466190780, 0.00699999973923411990, 0.00719999959022406179, 0.00739999990686974075, 0.00760000022351541970, 0.00780000007450314201, 0.00800000085680122562, 0.00819999951571714729, 0.00839999936671152921, 0.00860000014901294435, 0.00880000000000097544, 0.00899999985098616680, 0.00920000063328536150, 0.00939999929220017121, 0.00960000007450935791, 0.00979999992549597000, 0.00999999977648258209]
+sou.ports[1].m_flow=[-0.00999999977648258209, -0.00980000011175867491, -0.00960000044703476947, -0.00939999985098829982, -0.00920000018626438223, -0.00899999962747108188, -0.00879999992549399500, -0.00860000029802314089, -0.00839999966472450635, -0.00820000011175910787, -0.00800000040978140516, -0.00779999977648265438, -0.00760000007450550592, -0.00739999990686832001, -0.00719999988824135753, -0.00700000033527540567, -0.00680000001862605171, -0.00659999999999978312, -0.00639999998137434807, -0.00620000013038489364, -0.00600000011175834749, -0.00579999979510982793, -0.00559999977648272668, -0.00540000022351691273, -0.00519999990686839230, -0.00499999988824129105, -0.00480000003725183661, -0.00460000031664837584, -0.00439999999999985542, -0.00419999968335133499, -0.00400000042840694108, -0.00380000011175842022, -0.00359999979510989936, -0.00340000030733486180, -0.00319999999068675727, -0.00299999990686777070, -0.00280000018626444871, -0.00260000010244546128, -0.00240000001862647342, -0.00219999970197684233, -0.00200000021420347011, -0.00179999989755474216, -0.00159999969732098780, -0.00140000009313222436, -0.00120000000931323671, -0.00099999980907892745, -0.00080000014668302340, -0.00060000000465665370, -0.00039999977531894756, -0.00020000018568204714, 0.00000000000000000000, 0.00020000018567920501, 0.00040000037135854880, 0.00060000060069273628, 0.00079999955064460210, 0.00099999980908248125, 0.00120000000931252742, 0.00140000009313009151, 0.00160000029336155886, 0.00180000049359302599, 0.00199999961816496033, 0.00219999970198110585, 0.00240000001862789459, 0.00260000010244404011, 0.00280000018626018520, 0.00300000050290697437, 0.00319999939465131795, 0.00339999971129505401, 0.00359999979511203220, 0.00380000011175912972, 0.00400000042840338750, 0.00420000027939277515, 0.00439999940396554150, 0.00459999972060677956, 0.00480000003725467896, 0.00499999988824129105, 0.00520000020488697000, 0.00540000052153264895, 0.00560000037252370107, 0.00579999949709480295, 0.00599999981374048190, 0.00620000013038418413, 0.00639999998137221523, 0.00660000029801622885, 0.00680000061466190780, 0.00699999973923411990, 0.00719999959022406179, 0.00739999990686974075, 0.00760000022351541970, 0.00780000007450314201, 0.00800000085680122562, 0.00819999951571714729, 0.00839999936671152921, 0.00860000014901294435, 0.00880000000000097544, 0.00899999985098616680, 0.00920000063328536150, 0.00939999929220017121, 0.00960000007450935791, 0.00979999992549597000, 0.00999999977648258209]
diff --git a/Annex60/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumeSteadyStateMass.mos b/Annex60/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumeSteadyStateMass.mos
new file mode 100644
index 0000000000..de069a65b6
--- /dev/null
+++ b/Annex60/Resources/Scripts/Dymola/Fluid/MixingVolumes/Examples/MixingVolumeSteadyStateMass.mos
@@ -0,0 +1,31 @@
+oldStoreProtVar=Advanced.StoreProtectedVariables;
+Advanced.StoreProtectedVariables:=true;
+simulateModel("Annex60.Fluid.MixingVolumes.Examples.MixingVolumeSteadyStateMass", method="dassl", resultFile="MixingVolumeSteadyStateMass");
+createPlot(id=1, 
+position={0, 0, 804, 518}, 
+y={"vol.dynBal.m"}, 
+range={0.0, 1.0, 1.0, 1.4}, 
+grid=true, 
+subPlot=1,
+leftTitleType=1, 
+bottomTitleType=1, 
+colors={{0,0,255}});
+createPlot(id=1, 
+position={0, 0, 804, 256}, 
+y={"vol.T"}, 
+range={0.0, 1.0, 260.0, 340.0}, 
+grid=true, 
+subPlot=2, 
+leftTitleType=1, 
+bottomTitleType=1, 
+colors={{0,0,255}});
+createPlot(id=1, 
+position={35, 30, 730, 142}, 
+y={"sou.ports[1].m_flow", "vol.ports[2].m_flow"}, 
+range={0.0, 1.0, -0.02, 0.02}, 
+grid=true, 
+subPlot=3, 
+leftTitleType=1, 
+bottomTitleType=1, 
+colors={{0,0,255}, {255,0,0}});
+Advanced.StoreProtectedVariables=oldStoreProtVar;
\ No newline at end of file
diff --git a/Annex60/Utilities/Diagnostics/AssertInequality.mo b/Annex60/Utilities/Diagnostics/AssertInequality.mo
index 6577ec736c..c1be9edbf3 100644
--- a/Annex60/Utilities/Diagnostics/AssertInequality.mo
+++ b/Annex60/Utilities/Diagnostics/AssertInequality.mo
@@ -21,7 +21,7 @@ Documentation(
 info="<html>
 <p>
 Model that triggers an assert if
-<i>u1 > u2 - threShold</i>
+<i>u1 &gt; u2 - threShold</i>
 and <i>t &gt; t<sub>0</sub></i>.
 </p>
 </html>",
diff --git a/Annex60/Utilities/Math/Bicubic.mo b/Annex60/Utilities/Math/Bicubic.mo
index 63ab31f351..ffbe49cccf 100644
--- a/Annex60/Utilities/Math/Bicubic.mo
+++ b/Annex60/Utilities/Math/Bicubic.mo
@@ -11,6 +11,7 @@ equation
 Documentation(info="<html>
 <p>
 This block computes
+</p>
 <p align=\"center\" style=\"font-style:italic;\">
  y = a<sub>1</sub>
     + a<sub>2</sub>  x<sub>1</sub> + a<sub>3</sub>  x<sub>1</sub><sup>2</sup>
diff --git a/Annex60/Utilities/Math/Biquadratic.mo b/Annex60/Utilities/Math/Biquadratic.mo
index 61299048d4..e5523800a5 100644
--- a/Annex60/Utilities/Math/Biquadratic.mo
+++ b/Annex60/Utilities/Math/Biquadratic.mo
@@ -11,6 +11,7 @@ equation
 Documentation(info="<html>
 <p>
 This block computes
+</p>
 <p align=\"center\" style=\"font-style:italic;\">
   y =   a<sub>1</sub> + a<sub>2</sub>  x<sub>1</sub>
         + a<sub>3</sub>  x<sub>1</sub><sup>2</sup>
diff --git a/Annex60/Utilities/Math/Functions/BaseClasses/der_polynomial.mo b/Annex60/Utilities/Math/Functions/BaseClasses/der_polynomial.mo
index 9b285c59f9..fbbd234a96 100644
--- a/Annex60/Utilities/Math/Functions/BaseClasses/der_polynomial.mo
+++ b/Annex60/Utilities/Math/Functions/BaseClasses/der_polynomial.mo
@@ -20,7 +20,8 @@ The original polynomial has the form<br/>
   y = a<sub>1</sub> + a<sub>2</sub> x + a<sub>3</sub> x<sup>2</sup> + ...
 </p>
 <p>
-This function computes new coefficients<br/>
+This function computes new coefficients
+</p>
 <p align=\"center\" style=\"font-style:italic;\">
    b<sub>1</sub> = a<sub>2</sub>, b<sub>2</sub> = 2 a<sub>3</sub>, ...
 </p>
@@ -28,6 +29,7 @@ This function computes new coefficients<br/>
 and then calls recursively
 <a href=\"modelica://Annex60.Utilities.Math.Functions.polynomial\">
 Annex60.Utilities.Math.polynomial</a>
+</p>
 </html>",
 revisions="<html>
 <ul>
diff --git a/Annex60/Utilities/Math/Functions/inverseXRegularized.mo b/Annex60/Utilities/Math/Functions/inverseXRegularized.mo
index ba0abfc246..a90e7e8657 100644
--- a/Annex60/Utilities/Math/Functions/inverseXRegularized.mo
+++ b/Annex60/Utilities/Math/Functions/inverseXRegularized.mo
@@ -23,6 +23,7 @@ Function that approximates <i>y=1 &frasl; x</i>
 inside the interval <i>-&delta; &le; x &le; &delta;</i>.
 The approximation is twice continuously differentiable with a bounded derivative on the whole
 real line.
+</p>
 <p>
 See the package <code>Examples</code> for the graph.
 </p>
diff --git a/Annex60/Utilities/Math/Functions/powerLinearized.mo b/Annex60/Utilities/Math/Functions/powerLinearized.mo
index dffc74b927..1e71b202df 100644
--- a/Annex60/Utilities/Math/Functions/powerLinearized.mo
+++ b/Annex60/Utilities/Math/Functions/powerLinearized.mo
@@ -17,8 +17,8 @@ algorithm
 Function that approximates <i>y=x<sup>n</sup></i>
 where <i>0 &lt; n</i> so that
 <ul>
-<li>the function is defined and monotone increasing for all <i>x</i>.
-<li><i>dy/dx</i> is bounded and continuous everywhere (for <i>n &lt; 1</i>).
+<li>the function is defined and monotone increasing for all <i>x</i>.</li>
+<li><i>dy/dx</i> is bounded and continuous everywhere (for <i>n &lt; 1</i>).</li>
 </ul>
 <p>
 For <i>x &lt; x<sub>0</sub></i>, this function replaces
diff --git a/Annex60/Utilities/Math/Functions/regNonZeroPower.mo b/Annex60/Utilities/Math/Functions/regNonZeroPower.mo
index e82fc16d02..3604ab76ed 100644
--- a/Annex60/Utilities/Math/Functions/regNonZeroPower.mo
+++ b/Annex60/Utilities/Math/Functions/regNonZeroPower.mo
@@ -36,8 +36,8 @@ algorithm
 Function that approximates <i>y=|x|<sup>n</sup></i> where <i>n &gt; 0</i>
 so that
 <ul>
-<li><i>y(0)</i> is not equal to zero.
-<li><i>dy/dx</i> is bounded and continuous everywhere.
+<li><i>y(0)</i> is not equal to zero.</li>
+<li><i>dy/dx</i> is bounded and continuous everywhere.</li>
 </ul>
 
 <p>
diff --git a/Annex60/Utilities/Math/Functions/smoothExponential.mo b/Annex60/Utilities/Math/Functions/smoothExponential.mo
index b2f3bb37d7..754699b349 100644
--- a/Annex60/Utilities/Math/Functions/smoothExponential.mo
+++ b/Annex60/Utilities/Math/Functions/smoothExponential.mo
@@ -28,7 +28,7 @@ algorithm
 <p>
 Function to provide a once continuously differentiable approximation
 to <i>exp(- |x| )</i>
-in the interval <i>|x| < &delta;</i> for some positive <i>&delta;</i>
+in the interval <i>|x| &lt; &delta;</i> for some positive <i>&delta;</i>
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Annex60/Utilities/Math/Functions/spliceFunction.mo b/Annex60/Utilities/Math/Functions/spliceFunction.mo
index 9ee85ab2a7..5f57ffcd99 100644
--- a/Annex60/Utilities/Math/Functions/spliceFunction.mo
+++ b/Annex60/Utilities/Math/Functions/spliceFunction.mo
@@ -32,6 +32,7 @@ The function is adapted from
 <a href=\"modelica://Modelica.Media.Air.MoistAir.Utilities.spliceFunction\">
 Modelica.Media.Air.MoistAir.Utilities.spliceFunction</a> and provided here
 for easier accessability to model developers.
+</p>
 </html>", revisions="<html>
 <ul>
 <li>
diff --git a/Annex60/Utilities/Math/PowerLinearized.mo b/Annex60/Utilities/Math/PowerLinearized.mo
index 8e76bbca0c..aab1d9b442 100644
--- a/Annex60/Utilities/Math/PowerLinearized.mo
+++ b/Annex60/Utilities/Math/PowerLinearized.mo
@@ -15,8 +15,8 @@ equation
 Function that approximates <i>y=x<sup>n</sup></i>
 where <i>0 &lt; n</i> so that
 <ul>
-<li>the function is defined and monotone increasing for all <i>x</i>.
-<li><i>dy/dx</i> is bounded and continuous everywhere (for <i>n &lt; 1</i>).
+<li>the function is defined and monotone increasing for all <i>x</i>.</li>
+<li><i>dy/dx</i> is bounded and continuous everywhere (for <i>n &lt; 1</i>).</li>
 </ul>
 <p>
 For <i>x &lt; x<sub>0</sub></i>, this function replaces
diff --git a/Annex60/Utilities/Math/RegNonZeroPower.mo b/Annex60/Utilities/Math/RegNonZeroPower.mo
index 09c02f0a7c..b37c8b88e5 100644
--- a/Annex60/Utilities/Math/RegNonZeroPower.mo
+++ b/Annex60/Utilities/Math/RegNonZeroPower.mo
@@ -11,8 +11,8 @@ equation
 Function that approximates <i>y=|x|<sup>n</sup></i> where <i>n &gt; 0</i>
 so that
 <ul>
-<li><i>y(0)</i> is not equal to zero.
-<li><i>dy/dx</i> is bounded and continuous everywhere.
+<li><i>y(0)</i> is not equal to zero.</li>
+<li><i>dy/dx</i> is bounded and continuous everywhere.</li>
 </ul>
 
 <p>
diff --git a/Annex60/Utilities/Psychrometrics/pW_TDewPoi.mo b/Annex60/Utilities/Psychrometrics/pW_TDewPoi.mo
index c90093b018..1178f0381a 100644
--- a/Annex60/Utilities/Psychrometrics/pW_TDewPoi.mo
+++ b/Annex60/Utilities/Psychrometrics/pW_TDewPoi.mo
@@ -30,6 +30,7 @@ The approximation error of this simplified function is below 5% for a
 temperature of <i>0</i>&deg;C to <i>30</i>&deg;C.
 The benefit of this simpler function is that it can be inverted analytically,
 whereas the other function requires a numerical solution.
+</p>
 </html>", revisions="<html>
 <ul>
 <li>
diff --git a/Annex60/legal.html b/Annex60/legal.html
index ab4c1f1a1a..5874912525 100644
--- a/Annex60/legal.html
+++ b/Annex60/legal.html
@@ -2,11 +2,11 @@
 <html>
 <h1>Copyright and License</h1>
 
-<UL>
-<LI><A HREF="readme.html#copyRight">Copyright</A>
-<LI><A HREF="readme.html#license">The Modelica License 2</A>
-<LI><A HREF="readme.html#howTo">How to Apply the Modelica License 2</A>
-</LI></UL>
+<ul>
+<li><a href="readme.html#copyRight">Copyright</a>
+<li><a href="readme.html#license">The Modelica License 2</a>
+<li><a href="readme.html#howTo">How to Apply the Modelica License 2</a>
+</li></ul>
 
 
 <a name="copyRight"/>
@@ -15,7 +15,7 @@ <h2>Copyright</h2>
 Copyright (c) 2009-2013, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved.
 </p><p>
 If you have questions about your rights to use or distribute this software, please contact Berkeley Lab's Technology Transfer Department at
-<A HREF="mailto:TTD@lbl.gov">TTD@lbl.gov</A>
+<a href="mailto:TTD@lbl.gov">TTD@lbl.gov</a>
 </p><p>
 NOTICE. This software was developed under partial funding from the U.S. Department of Energy. As such, the U.S. Government has been granted for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software to reproduce, prepare derivative works, and perform publicly and display publicly. Beginning five (5) years after the date permission to assert copyright is obtained from the U.S. Department of Energy, and subject to any subsequent five (5) year renewals, the U.S. Government is granted for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software to reproduce, prepare derivative works, distribute copies to the public, perform publicly and display publicly, and to permit others to do so.
 </p>
@@ -72,11 +72,11 @@ <h3>2. Grant of Copyright License</h3>
 To create Derivative Works according to Section 1d) of this License.
 </li><li>
 To distribute or communicate to the public copies of the <u>Original Work</u> or a <u>Derivative Work</u> under <u>this License</u>. No fee, neither as a copyright-license fee, nor as a selling fee for the copy as such may be charged under this License. Furthermore, a verbatim copy of this License must be included in any copy of the Original Work or a Derivative Work under this License.
-<br>
+<br/>
 For the matter of clarity, it is permitted A) to distribute or communicate such copies as part of a (possible commercial) collection where other parts are provided under different licenses and a license fee is charged for the other parts only and B) to charge for mere printing and shipping costs.
 </li><li>
 To distribute or communicate to the public copies of a <u>Derivative Work</u>, alternatively to Section 2c), under <u>any other license</u> of your choice, especially also under a license for commercial/proprietary software, as long as You comply with Sections 3, 4 and 8 below.
-<br>
+<br/>
 For the matter of clarity, no restrictions regarding fees, either as to a copyright-license fee or as to a selling fee for the copy as such apply.
 </li></ul></li><li>
 To perform the Original Work publicly.
diff --git a/Annex60/package.mo b/Annex60/package.mo
index 5ffa60e52e..6e317d3846 100644
--- a/Annex60/package.mo
+++ b/Annex60/package.mo
@@ -74,48 +74,49 @@ in addition to the ones of the Modelica Standard Library:
 
 <ol>
 <li>
-The nomenclature used in the package
-<a href=\"modelica://Annex60.Utilities.Psychrometrics\">
-Annex60.Utilities.Psychrometrics</a>
- is as follows,
-<ul>
-<li>
-Uppercase <code>X</code> denotes mass fraction per total mass.
-</li>
-<li>
-Lowercase <code>x</code> denotes mass fraction per mass of dry air.
-</li>
-<li>
-The notation <code>z_xy</code> denotes that the function or block has output
-<code>z</code> and inputs <code>x</code> and <code>y</code>.
-</li>
-<li>
-The symbol <code>pW</code> denotes water vapor pressure, <code>TDewPoi</code>
-denotes dew point temperature, <code>TWetBul</code> denotes wet bulb temperature,
-and <code>TDryBul</code> (or simply <code>T</code>) denotes dry bulb temperature.
+  The nomenclature used in the package
+  <a href=\"modelica://Annex60.Utilities.Psychrometrics\">
+  Annex60.Utilities.Psychrometrics</a>
+   is as follows,
+  <ul>
+    <li>
+      Uppercase <code>X</code> denotes mass fraction per total mass.
+    </li>
+    <li>
+      Lowercase <code>x</code> denotes mass fraction per mass of dry air.
+    </li>
+    <li>
+      The notation <code>z_xy</code> denotes that the function or block has output
+      <code>z</code> and inputs <code>x</code> and <code>y</code>.
+      </li>
+    <li>
+      The symbol <code>pW</code> denotes water vapor pressure, <code>TDewPoi</code>
+      denotes dew point temperature, <code>TWetBul</code> denotes wet bulb temperature,
+      and <code>TDryBul</code> (or simply <code>T</code>) denotes dry bulb temperature.
+    </li>
+  </ul>
 </li>
-</ul>
 <li>
-Names of models, blocks and packages should start with an upper-case letter and be a
-noun or a noun with a combination of adjectives and nouns.
-Use camel-case notation to combine multiple words, such as <code>HeatTransfer</code>.
+  Names of models, blocks and packages should start with an upper-case letter and be a
+  noun or a noun with a combination of adjectives and nouns.
+  Use camel-case notation to combine multiple words, such as <code>HeatTransfer</code>.
 </li>
 <li>
-Parameter and variables names are usually a character, such as <code>T</code>
-for temperature and <code>p</code> for pressure, or a combination of the first three
-characters of a word, such as <code>higPreSetPoi</code> for high pressure set point.
+  Parameter and variables names are usually a character, such as <code>T</code>
+  for temperature and <code>p</code> for pressure, or a combination of the first three
+  characters of a word, such as <code>higPreSetPoi</code> for high pressure set point.
 </li>
 <li>
-Comments should be added to each class (package, model, function etc.).
-The first character should be upper case.
-For one-line comments of parameters, variables and classes, no period should be used at the end of the comment.
+  Comments should be added to each class (package, model, function etc.).
+  The first character should be upper case.
+  For one-line comments of parameters, variables and classes, no period should be used at the end of the comment.
 </li>
 <li>
-Where applicable, all variable must have units, also if the variable is protected.
+  Where applicable, all variable must have units, also if the variable is protected.
 </li>
 <li>
-To indicate that a class (i.e., a package, model, block etc.) has not been extensively tested or validated,
-its class name ends with the string <code>Beta</code>.
+  To indicate that a class (i.e., a package, model, block etc.) has not been extensively tested or validated,
+  its class name ends with the string <code>Beta</code>.
 </li>
 </ol>
 </html>"));
@@ -152,7 +153,7 @@ on the <code>Annex60</code> library.
     extends Modelica.Icons.Contact;
     annotation (preferredView="info",
     Documentation(info="<html>
-<h4><font color=\"#008000\" size=5>Contact</font></h4>
+<h4><font color=\"#008000\" size=\"5\">Contact</font></h4>
 <p>
 The development of the <code>Annex60</code> library is done through the
 <a href=\"http://www.iea-annex60.org\">Annex 60</a> project of the
@@ -168,7 +169,7 @@ Library point of contact<br/>
     Bldg. 90-3147<br/>
     Berkeley, CA 94720<br/>
     USA<br/>
-    email: <A HREF=\"mailto:MWetter@lbl.gov\">MWetter@lbl.gov</A><br/>
+    email: <a href=\"mailto:MWetter@lbl.gov\">MWetter@lbl.gov</a><br/>
 </p>
 </html>"));
   end Contact;
@@ -177,7 +178,7 @@ Library point of contact<br/>
     extends Modelica.Icons.Information;
     annotation (preferredView="info",
     Documentation(info="<html>
-<h4><font color=\"#008000\" size=5>Acknowledgements</font></h4>
+<h4><font color=\"#008000\" size=\"5\">Acknowledgements</font></h4>
 <p>
  The development of this library was supported
 </p>
@@ -186,6 +187,7 @@ Library point of contact<br/>
   Energy Efficiency and Renewable Energy, Office of Building
   Technologies of the U.S. Department of Energy, under
   contract No. DE-AC02-05CH11231.
+ </li>
  <li>
  fixme: add other funding agencies as appropriate.
  </li>
@@ -210,7 +212,7 @@ xxx add contributors for the first version in alphabetical order.
     extends Modelica.Icons.Information;
     annotation (preferredView="info",
     Documentation(info="<html>
-<h4><font color=\"#008000\" size=5>The Modelica License 2</font></h4>
+<h4><font color=\"#008000\" size=\"5\">The Modelica License 2</font></h4>
 <p>
 <strong>Preamble.</strong> The goal of this license is that Modelica related model libraries, software, images, documents, data files etc. can be used freely in the original or a modified form, in open source and in commercial environments (as long as the license conditions below are fulfilled, in particular sections 2c) and 2d). The Original Work is provided free of charge and the use is completely at your own risk. Developers of free Modelica packages are encouraged to utilize this license for their work.
 </p>
@@ -375,6 +377,7 @@ Furthermore, add the list of authors and contributors under
 For example, sublibrary Modelica.Blocks of the Modelica Standard Library may have the following notices:</p>
 <ul><li style=\"list-style-type:none\">
 Licensed by Modelica Association under the Modelica License 2 Copyright (c) 1998-2008, Modelica Association.
+</li>
 <li style=\"list-style-type:none\"><i>
 This Modelica package is <u>free</u> software and the use is completely at <u>your own risk</u>; it can be redistributed and/or modified under the terms of the Modelica license 2, see the license conditions (including the disclaimer of warranty) here or at
 <a href=\"http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.html\">http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.html</a>.
@@ -398,13 +401,13 @@ In these cases, save a copy of the Modelica License 2 in one directory of the di
     extends Modelica.Icons.Information;
     annotation (preferredView="info",
     Documentation(info="<html>
-<h4><font color=\"#008000\" size=5>Copyright</font></h4>
+<h4><font color=\"#008000\" size=\"5\">Copyright</font></h4>
 <p>
 Copyright (c) 2013, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved.
 </p>
 <p>
 If you have questions about your rights to use or distribute this software, please contact Berkeley Lab's Technology Transfer Department at
-<A HREF=\"mailto:TTD@lbl.gov\">TTD@lbl.gov</A>
+<a href=\"mailto:TTD@lbl.gov\">TTD@lbl.gov</a>
 </p>
 <p>
 NOTICE. This software was developed under partial funding from the U.S. Department of Energy. As such, the U.S. Government has been granted for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software to reproduce, prepare derivative works, and perform publicly and display publicly. Beginning five (5) years after the date permission to assert copyright is obtained from the U.S. Department of Energy, and subject to any subsequent five (5) year renewals, the U.S. Government is granted for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software to reproduce, prepare derivative works, distribute copies to the public, perform publicly and display publicly, and to permit others to do so.
@@ -444,7 +447,7 @@ to solve specific problems.
 <p>
 The library has the following <i>User's Guides</i>:
 </p>
-<table summary=\"summary\" border=1 cellspacing=0 cellpadding=2>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
 <tr><td valign=\"top\"><a href=\"modelica://Annex60.Fluid.UsersGuide\">Fluid</a>
    </td>
    <td valign=\"top\">Package for one-dimensional fluid in piping networks with heat exchangers, valves, etc.</td>
@@ -460,6 +463,7 @@ The library has the following <i>User's Guides</i>:
 <tr><td valign=\"top\"><a href=\"modelica://Annex60.Fluid.Sensors.UsersGuide\">Fluid.Sensors</a>
    </td>
    <td valign=\"top\">Package with sensors.</td>
+</tr>
 <tr><td valign=\"top\"><a href=\"modelica://Annex60.Fluid.Interfaces.UsersGuide\">Fluid.Interfaces</a>
    </td>
    <td valign=\"top\">Base models that can be used by developers to implement new models.</td>
diff --git a/bin/runUnitTests.py b/bin/runUnitTests.py
index 7ff837faa1..80f9581671 100755
--- a/bin/runUnitTests.py
+++ b/bin/runUnitTests.py
@@ -61,7 +61,7 @@ def _runUnitTests():
 #    ut.deleteTemporaryDirectories(False)
 #    ut.useExistingResults(['/tmp/tmp-Buildings-0-fagmeZ'])
 #    #print ut.getDataDictionary()
-    ut.setSinglePackage("Annex60.Fluid")
+#    ut.setSinglePackage("Annex60.Fluid.MassExchangers")
     retVal = ut.run()
     exit(retVal)
 
