diff --git a/src/xsl/openlearn2daisyhtml/inline.xsl b/src/xsl/openlearn2daisyhtml/inline.xsl
index 8a83fc7..7f52034 100644
--- a/src/xsl/openlearn2daisyhtml/inline.xsl
+++ b/src/xsl/openlearn2daisyhtml/inline.xsl
@@ -1,96 +1,100 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:template match="b">
-    <!-- b not available -->
-    <strong>
-      <xsl:apply-templates/>
-    </strong>
-  </xsl:template>
-  <xsl:template match="i">
-    <!-- i not available -->
-    <em>
-      <xsl:apply-templates/>
-    </em>
-  </xsl:template>
-  <xsl:template match="br">
-    <br/>
-  </xsl:template>
-  <xsl:template match="u">
-    <!-- deprecated -->
-    <em>
-      <xsl:apply-templates/>
-    </em>
-  </xsl:template>
-  <xsl:template match="sup">
-    <sup>
-      <xsl:apply-templates/>
-    </sup>
-  </xsl:template>
-  <xsl:template match="sub">
-    <sub>
-      <xsl:apply-templates/>
-    </sub>
-  </xsl:template>
-  <xsl:template match="smallCaps">
-    <xsl:variable name="small" select="'abcdefghijklmnopqrstuvwxyz'"/>
-    <xsl:variable name="caps" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
-    <xsl:value-of select="translate(text(), $small, $caps)"/>
-  </xsl:template>
-  <xsl:template match="SideNote">
-    <br/>
-    <span class="required-prodnote">Side note</span>
-    <xsl:apply-templates/>
-    <br/>
-    <span class="optional-prodnote">End of side note</span>
-    <br/>
-  </xsl:template>
-  <xsl:template match="SideNote/Heading">
-    <br/>
-    <em>
-      <xsl:apply-templates/>
-    </em>
-  </xsl:template>
-  <xsl:template match="SideNoteParagraph">
-    <br/>
-    <xsl:apply-templates/>
-  </xsl:template>
-    <xsl:template match="Footnote">
-    <br/>
-    <span class="required-prodnote">Footnote</span>
-    <br/>
-    <xsl:apply-templates/>
-    <br/>
-    <span class="optional-prodnote">End of footnote</span>
-    <br/>
-  </xsl:template>
-    <xsl:template match="InlineEquation">
-    <br/>
-    <xsl:apply-templates/>
-  </xsl:template>
-  <xsl:template match="InlineEquation/Image">
-    <img>
-      <xsl:attribute name="src">
-        <xsl:value-of select="./Image/@src"/>
-      </xsl:attribute>
-      <xsl:attribute name="alt">
-        <xsl:value-of select="./Image/@alt"/>
-      </xsl:attribute>
-    </img>
-  </xsl:template>
-  <xsl:template match="InlineEquation/Description">
-    <value-of select="text()"/>
-    <br/>
-  </xsl:template>
-  <xsl:template match="InlineEquation/Alternative">
-    <value-of select="text()"/>
-    <br/>
-  </xsl:template>
-  <xsl:template match="InlineEquation/TeX | InlineEquation/MathML"/>
-  <xsl:template match="AuthorComment">
-    <!-- omit -->
-    <xsl:apply-templates/>
-  </xsl:template>
-  <xsl:template match="EditorComment">
-    <!-- omit -->
-  </xsl:template>
-</xsl:stylesheet>
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:template match="b">
+    <!-- b not available -->
+    <strong>
+      <xsl:apply-templates/>
+    </strong>
+  </xsl:template>
+  <xsl:template match="i">
+    <!-- i not available -->
+    <em>
+      <xsl:apply-templates/>
+    </em>
+  </xsl:template>
+  <xsl:template match="br">
+    <br/>
+  </xsl:template>
+  <xsl:template match="u">
+    <!-- deprecated -->
+    <em>
+      <xsl:apply-templates/>
+    </em>
+  </xsl:template>
+  <xsl:template match="sup">
+    <sup>
+      <xsl:apply-templates/>
+    </sup>
+  </xsl:template>
+  <xsl:template match="sub">
+    <sub>
+      <xsl:apply-templates/>
+    </sub>
+  </xsl:template>
+  <xsl:template match="smallCaps">
+    <xsl:variable name="small" select="'abcdefghijklmnopqrstuvwxyz'"/>
+    <xsl:variable name="caps" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
+    <xsl:value-of select="translate(text(), $small, $caps)"/>
+  </xsl:template>
+  <xsl:template match="SideNote">
+    <br/>
+    <hr/>
+    <span class="required-prodnote">Side note</span>
+    <br/>
+    <xsl:apply-templates/>
+    <span class="optional-prodnote">End of side note</span>
+    <hr/>
+    <br/>
+  </xsl:template>
+  <xsl:template match="SideNote/Heading">
+    <br/>
+    <em>
+      <xsl:apply-templates/>
+    </em>
+  </xsl:template>
+  <xsl:template match="SideNoteParagraph">
+    <br/>
+    <xsl:apply-templates/>
+  </xsl:template>
+  <xsl:template match="Footnote">
+    <br/>
+    <hr/>
+    <span class="required-prodnote">Footnote</span>
+    <br/>
+    <xsl:apply-templates/>
+    <br/>
+    <hr/>
+    <span class="optional-prodnote">End of footnote</span>
+    <br/>
+  </xsl:template>
+  <xsl:template match="InlineEquation">
+    <br/>
+    <xsl:apply-templates/>
+  </xsl:template>
+  <xsl:template match="InlineEquation/Image">
+    <img>
+      <xsl:attribute name="src">
+        <xsl:value-of select="./Image/@src"/>
+      </xsl:attribute>
+      <xsl:attribute name="alt">
+        <xsl:value-of select="./Image/@alt"/>
+      </xsl:attribute>
+    </img>
+  </xsl:template>
+  <xsl:template match="InlineEquation/Description">
+    <value-of select="text()"/>
+    <br/>
+  </xsl:template>
+  <xsl:template match="InlineEquation/Alternative">
+    <value-of select="text()"/>
+    <br/>
+  </xsl:template>
+  <xsl:template match="InlineEquation/TeX | InlineEquation/MathML"/>
+  <xsl:template match="AuthorComment">
+    <!-- omit -->
+    <xsl:apply-templates/>
+  </xsl:template>
+  <xsl:template match="EditorComment">
+    <!-- omit -->
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/src/xsl/openlearn2daisyhtml/lang.xsl b/src/xsl/openlearn2daisyhtml/lang.xsl
index 9d9a45c..f963249 100644
--- a/src/xsl/openlearn2daisyhtml/lang.xsl
+++ b/src/xsl/openlearn2daisyhtml/lang.xsl
@@ -2,16 +2,20 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:template name="apply-templates-lang">
     <xsl:for-each select="@xml:lang">
-      <xsl:copy/>
+      <xsl:if test="string-length(.) &gt; 0">
+        <xsl:copy/>
+      </xsl:if>
     </xsl:for-each>
     <xsl:apply-templates/>
   </xsl:template>
   <xsl:template match="language">
-    <span>
-      <xsl:attribute name="xml:lang">
-        <xsl:value-of select="@val"/>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </span>
+    <xsl:if test="string-length(@val) &gt; 0">
+      <span>
+        <xsl:attribute name="xml:lang">
+          <xsl:value-of select="@val"/>
+        </xsl:attribute>
+        <xsl:apply-templates/>
+      </span>
+    </xsl:if>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/src/xsl/openlearn2daisyhtml/object.xsl b/src/xsl/openlearn2daisyhtml/object.xsl
index 6745085..7d82a3d 100644
--- a/src/xsl/openlearn2daisyhtml/object.xsl
+++ b/src/xsl/openlearn2daisyhtml/object.xsl
@@ -103,20 +103,36 @@
     <p>
       <span class="optional-prodnote">Figure</span>
     </p>
-    <p>
-      <img>
-        <xsl:attribute name="src">
-          <xsl:value-of select="./Image/@src"/>
-        </xsl:attribute>
-        <xsl:attribute name="alt">
-          <xsl:value-of select="./Image/@alt"/>
-        </xsl:attribute>
-      </img>
-    </p>
+    <xsl:choose>
+      <xsl:when test="string-length(./Image/@src) &gt; 0">
+        <img>
+          <xsl:attribute name="src">
+            <xsl:value-of select="./Image/@src"/>
+          </xsl:attribute>
+          <xsl:attribute name="alt">
+            <xsl:choose>
+              <xsl:when test="string-length(./Image/@alt) &gt; 0">
+                <xsl:value-of select="./Image/@alt"/>
+              </xsl:when>
+              <xsl:when test="string-length(Alternative) &gt; 0">
+                <xsl:value-of select="Alternative"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text>no alternative text</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:attribute>
+        </img>
+      </xsl:when>
+      <xsl:otherwise>
+        <p>
+          <xsl:apply-templates select="./Image/text() | ./Image/* "/>
+        </p>
+      </xsl:otherwise>
+    </xsl:choose>
     <xsl:apply-templates select="Caption"/>
-    <xsl:apply-templates select="Alternative"/>
     <xsl:apply-templates select="Description"/>
-    <xsl:apply-tempaltes select="SourceReference"/>
+    <xsl:apply-templates select="SourceReference"/>
     <p>
       <span class="optional-prodnote">End of figure</span>
     </p>
@@ -125,22 +141,39 @@
     <p>
       <span class="optional-prodnote">Equation</span>
     </p>
-    <p>
-      <img>
-        <xsl:attribute name="src">
-          <xsl:value-of select="./Image/@src"/>
-        </xsl:attribute>
-        <xsl:attribute name="alt">
-          <xsl:value-of select="./Image/@alt"/>
-        </xsl:attribute>
-      </img>
-    </p>
+    <xsl:choose>
+      <xsl:when test="string-length(./Image/@src) &gt; 0">
+        <img>
+          <xsl:attribute name="src">
+            <xsl:value-of select="./Image/@src"/>
+          </xsl:attribute>
+          <xsl:attribute name="alt">
+            <xsl:choose>
+              <xsl:when test="string-length(./Image/@alt) &gt; 0">
+                <xsl:value-of select="./Image/@alt"/>
+              </xsl:when>
+              <xsl:when test="string-length(Alternative) &gt; 0">
+                <xsl:value-of select="Alternative"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text>no alternative text</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:attribute>
+        </img>
+      </xsl:when>
+      <xsl:otherwise>
+        <p>
+          <xsl:apply-templates select="./Image/text() | ./Image/* "/>
+        </p>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates select="Label"/>
     <xsl:apply-templates select="TeX"/>
     <xsl:apply-templates select="MathML"/>
     <xsl:apply-templates select="Caption"/>
-    <xsl:apply-templates select="Alternative"/>
     <xsl:apply-templates select="Description"/>
-    <xsl:apply-tempaltes select="SourceReference"/>
+    <xsl:apply-templates select="SourceReference"/>
     <span class="optional-prodnote">End of equation</span>
   </xsl:template>
   <xsl:template match="Equation/TeX">
diff --git a/src/xsl/openlearn2daisyhtml/structure.xsl b/src/xsl/openlearn2daisyhtml/structure.xsl
index abe1f4e..601a5b9 100644
--- a/src/xsl/openlearn2daisyhtml/structure.xsl
+++ b/src/xsl/openlearn2daisyhtml/structure.xsl
@@ -10,9 +10,11 @@
   </xsl:template>
   <xsl:template match="UnitID"/>
   <xsl:template match="UnitTitle">
-    <h1>
-      <xsl:call-template name="apply-templates-lang"/>
-    </h1>
+    <xsl:if test="string-length(./text()) &gt; 0">
+      <h1>
+        <xsl:call-template name="apply-templates-lang"/>
+      </h1>
+    </xsl:if>
   </xsl:template>
   <xsl:template match="Unit/ByLine">
     <p>
@@ -125,15 +127,19 @@
   </xsl:template>
   <xsl:template match="MediaContent">
     <xsl:if test="@type = 'audio'">
-      <p><span class="required-prodnote">[Audio content]</span></p>
+      <p>
+        <span class="required-prodnote">[Audio content]</span>
+      </p>
       <p>
         <a><xsl:attribute name="href"><xsl:value-of select="@src"/>.mp3</xsl:attribute>MP3 file
       </a>
       </p>
-    </xsl:if>
-    <xsl:if test="@type = 'pdf'">
-      <p><span class="required-prodnote">[PDF content]</span></p>
-      <!--<p><a><xsl:attribute name="href"><xsl:value-of select="@src"/>.pdf</xsl:attribute></a></p>-->
+    </xsl:if>
+    <xsl:if test="@type = 'pdf'">
+      <p>
+        <span class="required-prodnote">[PDF content]</span>
+      </p>
+      <!--<p><a><xsl:attribute name="href"><xsl:value-of select="@src"/>.pdf</xsl:attribute></a></p>-->
     </xsl:if>
     <xsl:call-template name="apply-templates-lang"/>
     <p>
@@ -162,22 +168,32 @@
   </xsl:template>
   <xsl:template match="Caption">
     <p>
-      <xsl:call-template name="apply-templates-lang"/>
+      <span class="caption">
+        <xsl:call-template name="apply-templates-lang"/>
+      </span>
     </p>
   </xsl:template>
   <xsl:template match="Alternative">
     <p>
+      <xsl:if test="string-length(.) &gt; 0">
+        <span class="optional-prodnote"><strong>Alternative</strong>: </span>
+      </xsl:if>
       <xsl:call-template name="apply-templates-lang"/>
     </p>
   </xsl:template>
   <xsl:template match="Description">
     <p>
+      <xsl:if test="string-length(.) &gt; 0">
+        <span class="optional-prodnote"><strong>Description</strong>: </span>
+      </xsl:if>
       <xsl:call-template name="apply-templates-lang"/>
     </p>
   </xsl:template>
   <xsl:template match="Label">
     <p>
-      <xsl:call-template name="apply-templates-lang"/>
+      <strong>
+        <xsl:call-template name="apply-templates-lang"/>
+      </strong>
     </p>
   </xsl:template>
   <xsl:template match="Table">