diff --git a/format-master.xml b/format-master.xml
index c1150d4..962995c 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -49,7 +49,7 @@
 	
 	<!-- Special characters (should maybe all be named, in case they need to be called explicitly with xsl:call-template) -->
 	<!-- I'd like to use the Unicode names for these; will look them up some time! -->
-	<template name="newline" match="newline|line-break">
+	<template name="newline" match="newline|line-break|br">
 		<latex><xsl:text> \\
 </xsl:text></latex>
 		<html><BR/></html>
@@ -105,7 +105,7 @@
 		<html><xsl:text disable-output-escaping="yes">&amp;#8217;</xsl:text></html>
 	</template>
 
-	<template name="dollar" match="dollar">
+	<template name="dollar" match="dollar|dollar-sign">
 		<latex>{\$}</latex>
 		<html>$</html>
 	</template>
@@ -495,13 +495,6 @@
 		<html>
 			<xsl:if test="@label"><A NAME="{@label}"></A></xsl:if>
 			<xsl:apply-templates/>
-			<!-- Since HTML doesn't really support footnotes as such,
-			     include them as "section notes" instead.
-			-->
-			<xsl:if test="count(.//footnote) &gt; 0">
-				<P><STRONG>Notes:</STRONG></P>
-				<xsl:apply-templates select=".//footnote" mode="list"/>
-			</xsl:if>
 		</html>
 	</template>
 	
@@ -946,13 +939,16 @@
 		achieve in HTML).
 		
 		@rows: The number of rows this cell spans.
+		@header: Is this a header cell? [yes, NO]
 	-->
-	<template name="multirow-cell" match="cell" mode="multi-row">
+	<template name="multirow-cell" match="cell" mode="latex-multi-row">
 		<latex>
 			<xsl:text>\multirow{</xsl:text>
 			<xsl:value-of select="@rows"/>
 			<xsl:text>}{*}{</xsl:text>
+			<xsl:if test="@header = 'yes'"><xsl:text>\textbf{</xsl:text></xsl:if>
 			<xsl:apply-templates/>
+			<xsl:if test="@header = 'yes'"><xsl:text>}</xsl:text></xsl:if>
 			<xsl:text>}</xsl:text>
 		</latex>
 	</template>
@@ -962,8 +958,9 @@
 		achieve in HTML).
 		
 		$num-columns: The number of rows this cell spans.
+		@header: Is this a header cell? [yes, NO]
 	-->
-	<template name="multicolumn-cell" match="cell" mode="multi-column">
+	<template name="multicolumn-cell" match="cell" mode="latex-multi-column">
 		<latex>
 			<xsl:param name="num-columns">1</xsl:param>
 			<xsl:text>\multicolumn{</xsl:text>
@@ -985,13 +982,23 @@
 					<xsl:apply-templates select="." mode="multi-row"/>
 				</xsl:when>
 				<xsl:otherwise>
+					<xsl:if test="@header = 'yes'"><xsl:text>\textbf{</xsl:text></xsl:if>
 					<xsl:apply-templates/>
+					<xsl:if test="@header = 'yes'"><xsl:text>}</xsl:text></xsl:if>
 				</xsl:otherwise>
 			</xsl:choose>
 			<xsl:text>}</xsl:text>
 		</latex>
 	</template>
 	
+	<!--
+		Top-level template for generating cells.
+		
+		@columns: The number of columns this cell spans.
+		@rows: The number of rows this cell spans.
+		@align: The alignment of this cell. [LEFT, center, right]
+		@header: Is this a header cell? [yes, NO]
+	-->
 	<template match="cell">
 		<common>
 			<!-- position() doesn't seem to work very well in this context. -->
@@ -1008,18 +1015,20 @@
 		<latex>
 			<xsl:choose>
 				<xsl:when test="@columns">
-					<xsl:apply-templates select="." mode="multi-column">
+					<xsl:apply-templates select="." mode="latex-multi-column">
 						<xsl:with-param name="num-columns" select="@columns"/>
 					</xsl:apply-templates>
 				</xsl:when>
 				<xsl:when test="@align">
-					<xsl:apply-templates select="." mode="multi-column"/>
+					<xsl:apply-templates select="." mode="latex-multi-column"/>
 				</xsl:when>
 				<xsl:when test="@rows">
-					<xsl:apply-templates select="." mode="multi-row"/>
+					<xsl:apply-templates select="." mode="latex-multi-row"/>
 				</xsl:when>
 				<xsl:otherwise>
+					<xsl:if test="@header = 'yes'"><xsl:text>\textbf{</xsl:text></xsl:if>
 					<xsl:apply-templates/>
+					<xsl:if test="@header = 'yes'"><xsl:text>}</xsl:text></xsl:if>
 				</xsl:otherwise>
 			</xsl:choose>
 			<xsl:if test="$column-no != last()"> &amp; </xsl:if>
@@ -1029,6 +1038,7 @@
 			<TD>, regardless of the attributes supplied.
 		-->
 		<html>
+			<!-- Hmm, how to generate either a TD or TH as required, including attributes, without repeating code? -->
 			<TD>
 				<xsl:attribute name="ALIGN">
 					<xsl:value-of select="@align"/>
@@ -1260,6 +1270,7 @@
 				<!-- Allow the author to specify a non-standard image location on the fly. -->
 				<xsl:when test="count(location) != 0">
 					<xsl:value-of select="location"/>
+					<xsl:text>/</xsl:text>
 				</xsl:when>
 				<!-- new style in progress... -->
 				<xsl:otherwise>
@@ -1296,21 +1307,27 @@
 						<xsl:when test="(name(/child::node()[1])='tutorial') or (name(/child::node()[1])='laboratory') or /document/@class = 'tutorial' or /document/@class = 'laboratory' ">
 							<xsl:text>Graphics/</xsl:text>
 							<xsl:value-of select="basename|@basename"/>
-							<xsl:text>-72dpi.png</xsl:text>
+							<xsl:text>-72dpi</xsl:text>
+						</xsl:when>
+						<!-- Allow the author to specify a non-standard image location on the fly. -->
+						<xsl:when test="count(location) != 0">
+							<xsl:value-of select="location"/>
+							<xsl:text>/</xsl:text>
+							<xsl:value-of select="basename|@basename"/>
 						</xsl:when>
 						<xsl:otherwise>
 							<xsl:text>images/</xsl:text>
 							<xsl:value-of select="basename|@basename"/>
-							<xsl:text>.</xsl:text>
-							<xsl:choose>
-								<!-- CME: oops, I'd originally used the "format" tag to identify the format used in the LaTeX version, not the HTML! -->
-								<xsl:when test="count(format) != 0">
-									<xsl:value-of select="format"/>
-								</xsl:when>
-								<xsl:otherwise>
-									<xsl:text>png</xsl:text>
-								</xsl:otherwise>
-							</xsl:choose>
+						</xsl:otherwise>
+					</xsl:choose>
+					<xsl:text>.</xsl:text>
+					<xsl:choose>
+						<!-- CME: oops, I'd originally used the "format" tag to identify the format used in the LaTeX version, not the HTML! -->
+						<xsl:when test="count(format) != 0">
+							<xsl:value-of select="format"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:text>png</xsl:text>
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:attribute>
@@ -1324,6 +1341,9 @@
 		<html>
 			<A>
 				<xsl:attribute name="HREF">
+					<!-- This first bit needs to be updated to match the rest, particularly
+					     with regards to non-standard image directories.
+					-->
 					<xsl:text>images/</xsl:text>
 					<xsl:value-of select="basename|@basename"/>
 					<xsl:text>-zoom.</xsl:text>
@@ -1338,10 +1358,26 @@
 				</xsl:attribute>
 				<IMG BORDER="0">
 					<xsl:attribute name="SRC">
-						<xsl:text>images/</xsl:text>
-						<xsl:value-of select="basename|@basename"/>
+						<xsl:choose>
+							<xsl:when test="(name(/child::node()[1])='tutorial') or (name(/child::node()[1])='laboratory') or /document/@class = 'tutorial' or /document/@class = 'laboratory' ">
+								<xsl:text>Graphics/</xsl:text>
+								<xsl:value-of select="basename|@basename"/>
+								<xsl:text>-72dpi</xsl:text>
+							</xsl:when>
+							<!-- Allow the author to specify a non-standard image location on the fly. -->
+							<xsl:when test="count(location) != 0">
+								<xsl:value-of select="location"/>
+								<xsl:text>/</xsl:text>
+								<xsl:value-of select="basename|@basename"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:text>images/</xsl:text>
+								<xsl:value-of select="basename|@basename"/>
+							</xsl:otherwise>
+						</xsl:choose>
 						<xsl:text>.</xsl:text>
 						<xsl:choose>
+							<!-- CME: oops, I'd originally used the "format" tag to identify the format used in the LaTeX version, not the HTML! -->
 							<xsl:when test="count(format) != 0">
 								<xsl:value-of select="format"/>
 							</xsl:when>
@@ -1617,6 +1653,46 @@
 		<common> = </common>
 	</template>
 
+	<template name="greater-than-operator-math" match="greater-than|gt" mode="math">
+		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
+		<latex> &gt; </latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#62;</xsl:text></html>
+	</template>
+	<template name="greater-than-operator" match="greater-than|gt">
+		<latex> &gt; </latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#62;</xsl:text></html>
+	</template>
+
+	<template name="greater-equals-operator-math" match="greater-equals|ge" mode="math">
+		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
+		<latex> \geq </latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#8805;</xsl:text></html>
+	</template>
+	<template name="greater-equals-operator" match="greater-equals|ge">
+		<latex> \geq </latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#8805;</xsl:text></html>
+	</template>
+
+	<template name="less-than-operator-math" match="less-than|lt" mode="math">
+		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
+		<latex> &lt; </latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#60;</xsl:text></html>
+	</template>
+	<template name="less-than-operator" match="less-than|lt">
+		<latex> &lt; </latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#60;</xsl:text></html>
+	</template>
+
+	<template name="less-equals-operator-math" match="less-equals|le" mode="math">
+		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
+		<latex> \leq </latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#8804;</xsl:text></html>
+	</template>
+	<template name="less-equals-operator" match="less-equals|le">
+		<latex> \leq </latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#8804;</xsl:text></html>
+	</template>
+
 	<template name="approximately-equals-operator-math" match="approximately-equals|approximately-equal-to|approx" mode="math">
 		<latex>{\approx}</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#8776;</xsl:text></html>
