diff --git a/format-master.xml b/format-master.xml
index 0f3125c..e122c0d 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -146,7 +146,7 @@
 		<html><xsl:text disable-output-escaping="yes">&amp;#960;</xsl:text></html>
 	</template>
 
-	<!-- Not in math mode: -->
+	<!-- When not in math mode: -->
 	<template name="pi-normal" match="pi">
 		<latex>$\pi$</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#960;</xsl:text></html>
@@ -621,6 +621,12 @@
 	-->
 	<template name="omit" match="omit"/>
 
+	<!--
+		...and the legacy id tags inside figures.
+	-->
+	<template match="figure/id"/>
+	<template match="figure/label"/>
+
 	
 	<!--
 		Comments are not quite ignored completely, as they're carried through to the output document (kind of: "It is an error if instantiating the content of xsl:comment creates nodes other than text nodes.")
@@ -1008,12 +1014,14 @@
 				<xsl:if test="count(caption) != 0">
 					\caption{<xsl:apply-templates select="caption"/>}
 					<xsl:if test="@label">\label{<xsl:value-of select="@label"/>}</xsl:if>
+					<xsl:if test="count(id) != 0">\label{<xsl:value-of select="id"/>}</xsl:if>
 				</xsl:if>
 			\end{figure}
 		</latex>
 		<html>
 			<DIV CLASS="figure">
 				<xsl:if test="@label"><A NAME="{@label}"></A></xsl:if>
+				<xsl:if test="count(id) != 0"><A NAME="{id}"></A></xsl:if>
 				<xsl:apply-templates select="*[not(self::caption)]"/>
 				<xsl:if test="count(caption) != 0">
 					<BR/>
@@ -1087,6 +1095,7 @@
 			<!-- Use whatever standard image folder is appropriate for the context. -->
 			<xsl:choose>
 				<!-- Could possibly change this to test="/document/@class = 'tutorial'" or similar? -->
+				<!-- Sounds nicer...I think ideally the XSL processor would automatically figure out the path to the graphics based on the path to the source XML file.  Can this be done? -->
 				<xsl:when test="name(/child::node()[1])='tutorial'">
 					<xsl:text>{\tutroot/</xsl:text><xsl:value-of select="/tutorial/metadata/number-code"/><xsl:text>-</xsl:text><xsl:value-of select="/tutorial/metadata/title-code"/><xsl:text>/Graphics/</xsl:text>
 				</xsl:when>
@@ -1294,7 +1303,7 @@
 		<latex>
 			<xsl:text>\begin{eqnarray*}
 </xsl:text>
-			<xsl:apply-templates mode="math"/>
+			<xsl:apply-templates/>
 			<xsl:text>
 \end{eqnarray*}</xsl:text>
 		</latex>
@@ -1307,7 +1316,7 @@
 	<!-- Hmm, LaTeX uses "&" as separators: how do we know if there's another cell coming?  Ah, but the LaTeX eqnarray can have no more than three columns, so there's no need to generalise. -->
 	<template match="equation-array/row">
 		<latex>
-			<xsl:apply-templates select="left"/><xsl:text disable-output-escaping="yes">	&amp;	</xsl:text><xsl:apply-templates select="middle"/><xsl:text disable-output-escaping="yes">	&amp;	</xsl:text><xsl:apply-templates select="right"/><xsl:text>	\\
+			<xsl:apply-templates select="left" mode="math"/><xsl:text disable-output-escaping="yes">	&amp;	</xsl:text><xsl:apply-templates select="middle" mode="math"/><xsl:text disable-output-escaping="yes">	&amp;	</xsl:text><xsl:apply-templates select="right" mode="math"/><xsl:text>	\\
 		\\ </xsl:text>
 		</latex>
 		<html>
