diff --git a/xs3p.xsl b/xs3p.xsl
index d596d11..e37188b 100644
--- a/xs3p.xsl
+++ b/xs3p.xsl
@@ -91,7 +91,7 @@
  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns:ppp="http://titanium.dstc.edu.au/xml/xs3p"
- version="1.0"
+ version="2.0"
  exclude-result-prefixes="xsd ppp html">
 
    <xsl:output
@@ -404,7 +404,7 @@
             <!-- Document Footer -->
             <p class="footer">
                <xsl:text>Generated by </xsl:text>
-               <a href="http://github.com/bitfehler/xs3p">xs3p-ch</a> (fork of <a href="http://xml.fiforms.org/xs3p/">xs3p</a>)
+               <a href="http://github.com/pwin/xs3p">xs3p-2</a> (fork of <a href="http://xml.fiforms.org/xs3p/">xs3p</a> and <a href="http://github.com/bitfehler/xs3p">xs3p-ch</a>)
                <xsl:text>. Last Modified: </xsl:text>
                <xsl:call-template name="PrintJSCode">
                   <xsl:with-param name="code">document.write(document.lastModified);</xsl:with-param>
@@ -757,6 +757,11 @@ pre {
     padding-bottom: 10px;
     background-color: #EEE;
     border-radius: 10px;
+    position: fixed;
+    top: 65px;
+    width: 22%;
+    height: 90%;
+    overflow: auto;
 }
 .xs3p-navbar-title {
     color: #FFF !important;
@@ -4202,14 +4207,16 @@ pre {
          <xsl:with-param name="count" select="$margin"/>
       </xsl:call-template>
 
+<!-- PW changes start - to make compatible with Saxon 9 -->
       <xsl:choose>
-         <xsl:when test="$isNewField!='false'">
+         <xsl:when test="$isNewField!='false'  and parent::node() != document-node()">
             <xsl:attribute name="class">newFields</xsl:attribute>
          </xsl:when>
-         <xsl:when test="$isInherited!='false'">
+         <xsl:when test="$isInherited!='false' and parent::node() != document-node()">
             <xsl:attribute name="class">inherited</xsl:attribute>
          </xsl:when>
       </xsl:choose>
+<!-- PW changes end -->
 
       <!-- Start Tag -->
       <span class="nt">
@@ -4641,7 +4648,7 @@ pre {
                <xsl:with-param name="isNewField" select="$isNewField"/>
                <xsl:with-param name="margin" select="$margin"/>
                <xsl:with-param name="schemaLoc" select="$schemaLoc"/>
-               <xsl:with-param name="typeList" select="concat($typeList, '*', $type/@name, '+')"/>
+               <!--  xsl:with-param name="typeList" select="concat($typeList, '*', $type/@name, '+')"/  -->
             </xsl:call-template>
          </xsl:when>
          <!-- Ignore base types that are simple types -->
@@ -7164,9 +7171,11 @@ pre {
                           No documentation provided.
                         </xsl:when>
                         <xsl:when test="normalize-space(translate($containsCode,'TRUE','true'))='true'">
-                           <pre class="codehilite">
+                           <!-- PW edit start .. because of problems with <pre/> tags -->
+                           <samp class="codehilite">
                               <xsl:copy-of select="$contents"/>
-                           </pre>
+                           </samp>
+                           <!-- PW edit end -->
                         </xsl:when>
                         <xsl:otherwise>
                            <xsl:copy-of select="$contents"/>