diff --git a/IBPSA/Electrical/BaseClasses/PV/PVThermalEmpMountCloseToGround.mo b/IBPSA/Electrical/BaseClasses/PV/PVThermalEmpMountCloseToGround.mo
index 4afd4185b6..50b5bb8646 100644
--- a/IBPSA/Electrical/BaseClasses/PV/PVThermalEmpMountCloseToGround.mo
+++ b/IBPSA/Electrical/BaseClasses/PV/PVThermalEmpMountCloseToGround.mo
@@ -1,6 +1,6 @@
-within IBPSA.Electrical.BaseClasses.PV;
+within IBPSA.Electrical.BaseClasses.PV;
 model PVThermalEmpMountCloseToGround
-  "Empirical thermal model for PV cell with back close to ground ~(0 ° < til < 10 °)"
+  "Empirical thermal model for PV cell with back close to ground ~(0 deg < til < 10 deg)"
 extends IBPSA.Electrical.BaseClasses.PV.BaseClasses.PartialPVThermalEmp;
 
 equation
diff --git a/IBPSA/Electrical/BaseClasses/PV/PVThermalEmpMountOpenRack.mo b/IBPSA/Electrical/BaseClasses/PV/PVThermalEmpMountOpenRack.mo
index aad3984aa1..09b19714cf 100644
--- a/IBPSA/Electrical/BaseClasses/PV/PVThermalEmpMountOpenRack.mo
+++ b/IBPSA/Electrical/BaseClasses/PV/PVThermalEmpMountOpenRack.mo
@@ -1,6 +1,6 @@
-within IBPSA.Electrical.BaseClasses.PV;
+within IBPSA.Electrical.BaseClasses.PV;
 model PVThermalEmpMountOpenRack
-  "Empirical thermal model for PV cell with open rack mounting (tilt >= 10 °)"
+  "Empirical thermal model for PV cell with open rack mounting (tilt >= 10 deg)"
   extends IBPSA.Electrical.BaseClasses.PV.BaseClasses.PartialPVThermalEmp;
 
  final parameter Modelica.Units.SI.Temperature TDryBul0=293.15
diff --git a/IBPSA/Electrical/DC/Sources/PVSingleDiode.mo b/IBPSA/Electrical/DC/Sources/PVSingleDiode.mo
index 07da682c2d..e90305e073 100644
--- a/IBPSA/Electrical/DC/Sources/PVSingleDiode.mo
+++ b/IBPSA/Electrical/DC/Sources/PVSingleDiode.mo
@@ -1,6 +1,6 @@
 within IBPSA.Electrical.DC.Sources;
 model PVSingleDiode
-  "Photovoltaic module(s) model based on single diode approach"
+  "Photovoltaic module model based on single diode approach"
   extends IBPSA.Electrical.BaseClasses.PV.PartialPVSystem(
     replaceable IBPSA.Electrical.Data.PV.SingleDiodeData data,
     redeclare IBPSA.Electrical.BaseClasses.PV.PVOpticalAbsRat
@@ -26,33 +26,29 @@ equation
   connect(PVThermal.TCel, PVElectrical.TCel) annotation (Line(
         points={{-4.54545,-10},{0,-10},{0,-14},{-58,-14},{-58,-46.25},{-17.2,-46.25}},
                         color={0,0,127}));
-  connect(PVElectrical.P, PDC) annotation (Line(points={{-3.4,-46.25},{20,
-          -46.25},{20,-40},{60,-40},{60,0},{90,0}},
-                                             color={0,0,127}));
+  connect(PVElectrical.P, PDC) annotation (Line(points={{-3.4,-46.25},{20,-46.25},
+          {20,-40},{60,-40},{60,0},{110,0}}, color={0,0,127}));
   connect(PVOptical.absRadRat, PVElectrical.absRadRat)
     annotation (Line(points={{-4.54545,30},{20,30},{20,-34},{-64,-34},{-64,-52.25},
           {-17.2,-52.25}},color={0,0,127}));
-  connect(HGloTil, PVElectrical.HGloTil) annotation (Line(points={{-100,-60},
-          {-100,-60},{-100,-54},{-68,-54},{-68,-55.25},{-17.2,-55.25}},color={0,
+  connect(HGloTil, PVElectrical.HGloTil) annotation (Line(points={{-120,-60},{-100,
+          -60},{-100,-54},{-68,-54},{-68,-55.25},{-17.2,-55.25}},      color={0,
           0,127}));
-  connect(TDryBul, PVThermal.TDryBul) annotation (Line(points={{-100,0},{
-          -60,0},{-60,-4.6},{-17.0909,-4.6}},color={0,0,127}));
-  connect(HGloTil, PVThermal.HGloTil) annotation (Line(points={{-100,-60},
-          {-80,-60},{-80,6},{-40,6},{-40,-15.4},{-17.0909,-15.4}},
-                                                           color={0,0,127}));
-  connect(vWinSpe, PVThermal.winVel) annotation (Line(points={{-100,30},{
-          -40,30},{-40,28},{-52,28},{-52,-8.2},{-17.0909,-8.2}},
-                                                          color={0,0,127}));
-  connect(zenAngle, PVOptical.zenAng) annotation (Line(points={{-100,90},
-          {-44,90},{-44,34.2},{-17.0909,34.2}},
-                                              color={0,0,127}));
-  connect(incAngle, PVOptical.incAng) annotation (Line(points={{-100,60},
-          {-100,64},{-22,64},{-22,31.8},{-17.0909,31.8}},         color={0,0,127}));
-  connect(HDifHor, PVOptical.HDifHor) annotation (Line(points={{-100,-90},
-          {-100,70},{-72,70},{-72,27},{-17.0909,27}},               color={0,0,127}));
+  connect(TDryBul, PVThermal.TDryBul) annotation (Line(points={{-120,0},{-60,0},
+          {-60,-4.6},{-17.0909,-4.6}},       color={0,0,127}));
+  connect(HGloTil, PVThermal.HGloTil) annotation (Line(points={{-120,-60},{-80,-60},
+          {-80,6},{-40,6},{-40,-15.4},{-17.0909,-15.4}},   color={0,0,127}));
+  connect(vWinSpe, PVThermal.winVel) annotation (Line(points={{-120,30},{-40,30},
+          {-40,28},{-52,28},{-52,-8.2},{-17.0909,-8.2}},  color={0,0,127}));
+  connect(zenAngle, PVOptical.zenAng) annotation (Line(points={{-120,90},{-44,90},
+          {-44,34.2},{-17.0909,34.2}},        color={0,0,127}));
+  connect(incAngle, PVOptical.incAng) annotation (Line(points={{-120,60},{-120,64},
+          {-22,64},{-22,31.8},{-17.0909,31.8}},                   color={0,0,127}));
+  connect(HDifHor, PVOptical.HDifHor) annotation (Line(points={{-120,-90},{-120,
+          70},{-72,70},{-72,27},{-17.0909,27}},                     color={0,0,127}));
 
-  connect(HGloHor, PVOptical.HGloHor) annotation (Line(points={{-100,-30},
-          {-20,-30},{-20,29.4},{-17.0909,29.4}},color={0,0,127}));
+  connect(HGloHor, PVOptical.HGloHor) annotation (Line(points={{-120,-30},{-20,-30},
+          {-20,29.4},{-17.0909,29.4}},          color={0,0,127}));
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)),
                 Documentation(info="<html>
diff --git a/IBPSA/Electrical/DC/Sources/Validation/BaseClasses/partialPVRooftopBuildingValidation.mo b/IBPSA/Electrical/DC/Sources/Validation/BaseClasses/partialPVRooftopBuildingValidation.mo
index 20900fa0bd..c10f9819a1 100644
--- a/IBPSA/Electrical/DC/Sources/Validation/BaseClasses/partialPVRooftopBuildingValidation.mo
+++ b/IBPSA/Electrical/DC/Sources/Validation/BaseClasses/partialPVRooftopBuildingValidation.mo
@@ -1,7 +1,6 @@
-within IBPSA.Electrical.DC.Sources.Validation.BaseClasses;
+within IBPSA.Electrical.DC.Sources.Validation.BaseClasses;
 partial model partialPVRooftopBuildingValidation
-  "Partial model for validation with empirical data from a rooftop PV system in
-  at UdK, Berlin, from July 27th to Aug 9th"
+  "Partial model for validation with empirical data from a rooftop PV system in at UdK, Berlin, from July 27th to Aug 9th"
   extends Modelica.Icons.Example;
     parameter Modelica.Units.SI.Time timZon=+7200
     "Time zone";
@@ -138,7 +137,7 @@ equation
         (1+0.033*cos(360*(Modelica.Constants.pi/180)*cloTim/24/60/60/365)*
         (cos(lat)*cos(SolDec)*cos(SolHouAng)+sin(lat)*sin(SolDec)))))));
 
-  // Erb´s diffuse fraction relation
+  // Erbs diffuse fraction relation
   HGloHorDif = if HGloHor <=0.01 then
                  0
                elseif k_t <= 0.22 then
diff --git a/IBPSA/Electrical/DC/Sources/Validation/PVSingleDiodeNISTValidation.mo b/IBPSA/Electrical/DC/Sources/Validation/PVSingleDiodeNISTValidation.mo
index 7f78ec1f1b..ef0078b1c5 100644
--- a/IBPSA/Electrical/DC/Sources/Validation/PVSingleDiodeNISTValidation.mo
+++ b/IBPSA/Electrical/DC/Sources/Validation/PVSingleDiodeNISTValidation.mo
@@ -110,7 +110,7 @@ equation
         (1+0.033*cos(360*(Modelica.Constants.pi/180)*cloTim/24/60/60/365)*
         (cos(lat)*cos(SolDec)*cos(SolHouAng)+sin(lat)*sin(SolDec)))))));
 
-  // Erb´s diffuse fraction relation
+  // Erbs diffuse fraction relation
   HGloHorDif = if HGloHor <=0.01 then
                  0
                elseif k_t <= 0.22 then