diff --git a/format-master.xml b/format-master.xml
index 74d64c3..d96d7cc 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -406,7 +406,34 @@
 			</xsl:choose>
 		</html>
 	</template>
-	
+
+
+	<!--
+		Sample answers, which may optionally be excluded from the output.
+	-->
+
+	<template name="answer" match="answer">
+		<latex>
+			<!--
+				It's nice to weed out the sample answer markup at the XSLT processing stage to make LaTeX run faster.
+				Note that \showanswers still needs to be called so that LaTeX can format chapter headings like "Answers for ..."
+			-->
+			<xsl:if test="$showanswers='yes'">
+			\begin{answer}
+				<xsl:apply-templates/>
+			\end{answer}
+
+			</xsl:if>
+		</latex>
+		<html>
+			<xsl:if test="$showanswers='yes'">
+				<DIV CLASS="answer">
+					<xsl:apply-templates/>
+				</DIV>
+			</xsl:if>
+		</html>
+	</template>
+
 	
 	<!--
 		Sections, subsections, subsubsections, ...
@@ -509,9 +536,22 @@
 
 	<template name="document-title" match="document/title">
 		<!-- Need to do something sensible for LaTeX here. -->
-		<latex><xsl:if test="$standalone = 'no'"></xsl:if></latex>
+		<latex>
+			<!-- Under the LaTeX framework, the rest of the chapter title text is generated by LaTeX macros, so this is pretty simple. -->
+			<xsl:apply-templates/>
+		</latex>
 		<html>
-			<H1><xsl:apply-templates/></H1>
+			<xsl:choose>
+				<xsl:when test="/document/@class = 'tutorial'">
+					<H1><xsl:call-template name="PaperCode"/> Tutorial <xsl:value-of select="//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
+				</xsl:when>
+				<xsl:when test="/document/@class = 'laboratory'">
+					<H1><xsl:call-template name="PaperCode"/> Lab <xsl:value-of select="//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
+				</xsl:when>
+				<xsl:otherwise>
+					<H1><xsl:apply-templates/></H1>
+				</xsl:otherwise>
+			</xsl:choose>
 		</html>
 	</template>
 	
@@ -1107,12 +1147,13 @@
 			<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 test="name(/child::node()[1])='tutorial' or /document/@class = 'tutorial'">
+					<xsl:text>{\tutroot/</xsl:text><xsl:value-of select="//metadata/number-code"/><xsl:text>-</xsl:text><xsl:value-of select="//metadata/title-code"/><xsl:text>/Graphics/</xsl:text>
 				</xsl:when>
-				<xsl:when test="name(/child::node()[1])='laboratory'">
-					<xsl:text>{\labroot/</xsl:text><xsl:value-of select="/laboratory/metadata/number-code"/><xsl:text>-</xsl:text><xsl:value-of select="/laboratory/metadata/title-code"/><xsl:text>/Graphics/</xsl:text>
+				<xsl:when test="name(/child::node()[1])='laboratory' or /document/@class = 'laboratory'">
+					<xsl:text>{\labroot/</xsl:text><xsl:value-of select="//metadata/number-code"/><xsl:text>-</xsl:text><xsl:value-of select="//metadata/title-code"/><xsl:text>/Graphics/</xsl:text>
 				</xsl:when>
+				<!-- new style in progress... -->
 				<xsl:otherwise>
 					<xsl:text>{images/</xsl:text>
 				</xsl:otherwise>
