diff --git a/format-master.xml b/format-master.xml
index beda76c..b61825f 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -132,6 +132,7 @@
 		<html><xsl:text disable-output-escaping="yes">&amp;#182;</xsl:text></html>
 	</template>
 
+	<!-- I think this might cause problems if it occurs in a math environment context...? -->
 	<template name="pi" match="pi">
 		<latex>$\pi$</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#960;</xsl:text></html>
@@ -938,7 +939,8 @@
 	</template>
 	
 	
-	<!-- Images. Includes a scaling factor for LaTeX.  To do: alternatively, allow defining the scaling factor by specifying what proportion of the page width the image should occupy. -->
+	<!-- Images. Includes a scaling factor for LaTeX.  To do: alternatively, allow defining the scaling factor by specifying what proportion of the page width the image should occupy (a la LaTeX [width] parameter). -->
+	<!-- To do: if no description is given, use the basename as the content of the ALT element. -->
 	
 	<!-- LaTeX images are always handled the same way regardless. -->
 	<template match="image" mode="latex">
@@ -980,15 +982,24 @@
 		<html>
 			<IMG BORDER="0">
 				<xsl:attribute name="SRC">
-					<xsl:text>images/</xsl:text>
-					<xsl:value-of select="basename"/>
-					<xsl:text>.</xsl:text>
 					<xsl:choose>
-						<xsl:when test="count(format) != 0">
-							<xsl:value-of select="format"/>
+						<xsl:when test="(name(/child::node()[1])='tutorial') or (name(/child::node()[1])='laboratory')">
+							<xsl:text>Graphics/</xsl:text>
+							<xsl:value-of select="basename"/>
+							<xsl:text>-72dpi.png</xsl:text>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:text>png</xsl:text>
+							<xsl:text>images/</xsl:text>
+							<xsl:value-of select="basename"/>
+							<xsl:text>.</xsl:text>
+							<xsl:choose>
+								<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:attribute>
@@ -1135,6 +1146,7 @@
 
 	
 	<!-- Equation arrays -->
+	
 	<template name="equation-array" match="equation-array">
 		<latex>
 			<xsl:text>\begin{eqnarray*}
@@ -1162,6 +1174,14 @@
 		</html>
 	</template>
 	
+
+	<!-- Digit grouping separator character for large numbers. -->
+	<template name="digit-group-separator" match="digit-group-separator">
+		<common>
+			<xsl:call-template name="non-breaking-space"/>
+		</common>
+	</template>
+	<alias source="digitsep" target="digit-group-separator"/>
 	
 	<!-- Super- and subscript. -->
 	<template name="superscript" match="math//superscript">
@@ -1187,6 +1207,7 @@
 		<latex>\times</latex>
 		<html><xsl:text disable-output-escaping="yes"> &amp;#215; </xsl:text></html>
 	</template>
+	<alias source="times" target="times-operator"/>
 	
 	<template name="divide-operator" match="math//divide">
 		<common>/</common>
