diff --git a/Doc/Sd1/Arrays/arrays.xml b/Doc/Sd1/Arrays/arrays.xml
index b259220f97d08b254694e61e14413003b3e0e189..b8bc746125ec2edf414412a0fb3922d04b0d9367 100644
--- a/Doc/Sd1/Arrays/arrays.xml
+++ b/Doc/Sd1/Arrays/arrays.xml
@@ -1119,7 +1119,7 @@ System.out.format("An integer %3d and a double value %6.2f\n",
                                                     Integer.valueOf(secondValue)};</programlisting>
 
                 <para>As you can see this code is clumsy in comparison to the
-                <quote>varargs</quote> mechanism. </para>
+                <quote>varargs</quote> mechanism.</para>
               </listitem>
 
               <listitem>
@@ -1968,12 +1968,12 @@ Parameter 3: -13</screen>
       <mediaobject>
         <imageobjectco>
           <areaspec otherunits="imagemap" units="other">
-            <area  units="calspair" coords="407,98,521,139"
-                  linkends="sd1_array_fig_ideaRunConfig-1"
+            <area coords="407,98,521,139"
+                  linkends="sd1_array_fig_ideaRunConfig-1" units="calspair"
                   xml:id="__area-ypcokm"/>
 
-            <area  units="calspair" coords="410,161,526,202"
-                  linkends="sd1_array_fig_ideaRunConfig-2"
+            <area coords="410,161,526,202"
+                  linkends="sd1_array_fig_ideaRunConfig-2" units="calspair"
                   xml:id="__area-qny3zv"/>
           </areaspec>
 
@@ -2778,11 +2778,11 @@ June, please enter next field's number:</screen>
 
                       <listitem>
                         <para>The numbering hints should appear
-                        <quote>right</quote> to the current tic-tac-toe board
-                        rather than on top of it. Furthermore only the
-                        remaining free fields shall be on offer. In the next
-                        example this restriction excludes position
-                        <quote>4</quote>:</para>
+                        <quote>right</quote> to the current
+                        <productname>tic-tac-toe</productname> board rather
+                        than on top of it. Furthermore only the remaining free
+                        fields shall be on offer. In the next example this
+                        restriction excludes position <quote>4</quote>:</para>
 
                         <screen>Player June(O)
 vs. Bill(X)          Free fields
@@ -2812,22 +2812,23 @@ Bill, please enter next field's number:</screen>
     </section>
 
     <section xml:id="sd1SectTicTacToeComputerVsHuman">
-      <title>Tic-tac-toe, Computer vs. human</title>
+      <title><productname>Tic-tac-toe</productname>, Computer
+      <abbrev>vs.</abbrev> human</title>
 
       <qandaset defaultlabel="qanda" xml:id="sd1QandaTicTacToeComputerVsHuman">
         <qandadiv>
           <qandaentry>
             <question>
-              <para>This exercise is beyond the current lecture's scope. Feel
-              free to solve it at your own discretion if you are desperately
-              searching for a more challenging problem.</para>
-
-              <para>Your solution should allow for humans playing
+              <para>This exercise is beyond the current lecture's scope with
+              respect to complexity. Feel free to solve it at your own
+              discretion in case of hunting for challenges. Your
+              implementation will allow humans playing
               <productname>tic-tac-toe</productname> against a
               computer:</para>
 
               <figure xml:id="sd1FigTicTacToeHumanVsComputer">
-                <title>Two Tic-tac-toe players fighting each other.</title>
+                <title>Two <productname>Tic-tac-toe</productname> players
+                fighting each other.</title>
 
                 <mediaobject>
                   <videoobject>
@@ -2878,10 +2879,20 @@ Bill, please enter next field's number:</screen>
         <qandaentry>
           <question>
             <para>Extend <xref linkend="sd1QandaIntStoreUnbounded"/> by
-            providing a method <methodname>double getAverage()</methodname> to
-            provide statistical data on a given set of integer values. In
-            addition provide a method <methodname>void clear()</methodname>
-            enabling a user to support different sets of values.</para>
+            providing:</para>
+
+            <orderedlist>
+              <listitem>
+                <para>A method <methodname>double getAverage()</methodname>
+                providing statistical data on a given set of integer
+                values.</para>
+              </listitem>
+
+              <listitem>
+                <para>A method <methodname>void clear()</methodname> enabling
+                a user to insert new sets of values.</para>
+              </listitem>
+            </orderedlist>
 
             <para>Do not forget to extend your <xref linkend="glo_Junit"/>
             tests. You may want to import the <link