diff --git a/format-master.xml b/format-master.xml
index 69038f9..deeba19 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -21,7 +21,7 @@
 		<latex><xsl:text>
 
 
-</xsl:text><xsl:apply-templates/><xsl:text>
+</xsl:text><xsl:if test="@noindent">\noindent </xsl:if><xsl:apply-templates/><xsl:text>
 	
 		
 </xsl:text></latex>
@@ -34,8 +34,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"><latex>
-</latex><html><BR/></html></template>
+	<template name="newline" match="newline"><latex> \\</latex><html><BR/></html></template>
 <template name="non-breaking-space" match="non-breaking-space"><latex>~</latex><html>&#160;</html></template>	
 <alias source="nbsp" target="non-breaking-space"/>
 
@@ -152,11 +151,11 @@
 	<!-- Ordered lists -->
 	
 	<template name="enumerated-list" match="enumerated-list">
-		<latex><xsl:text>
+		<latex>
 			\begin{enumerate}
 				<xsl:apply-templates/>
 			\end{enumerate}
-		</xsl:text></latex>
+		</latex>
 		<html>
 			<OL>
 				<xsl:apply-templates/>
@@ -171,11 +170,11 @@
 	
 	<!-- Definition or description lists. -->
 	<template name="definition-list" match="definition-list">
-		<latex><xsl:text>
+		<latex>
 			\begin{description}
 				<xsl:apply-templates/>
 			\end{description}
-		</xsl:text></latex>
+		</latex>
 		<html>
 			<DL>
 				<xsl:apply-templates/>
@@ -218,7 +217,12 @@
 	<!-- Sections, subsections, subsubsections, ... -->
 	<template name="section" match="section">
 		<latex>
-			<xsl:apply-templates/>
+			<xsl:apply-templates>
+				<xsl:with-param name="label">
+					<xsl:value-of select="@label"/>
+					<xsl:if test="not(@label)">THERE_IS_NO_LABEL</xsl:if>
+				</xsl:with-param>
+			</xsl:apply-templates>
 		</latex>
 		<html>
 			<xsl:if test="@label"><A NAME="{@label}"></A></xsl:if>
@@ -226,6 +230,34 @@
 		</html>
 	</template>
 
+	
+	<!-- Document preamble stuff: title, author, date. -->
+	<template name="preamble-title" match="document/title" mode="preamble">
+		<latex>\title{<xsl:apply-templates/>}</latex>
+		<html>
+			<xsl:apply-templates/>
+		</html>
+	</template>
+
+	<template name="preamble-author" match="document/author" mode="preamble">
+		<latex>\author{<xsl:apply-templates/>}</latex>
+	</template>
+
+	<template name="preamble-date" match="document/date" mode="preamble">
+		<latex>\date{<xsl:apply-templates/>}</latex>
+	</template>
+
+	<template name="document-title" match="document/title">
+		<!-- Need to do something sensible for LaTeX here. -->
+		<latex><xsl:if test="$standalone = 'no'"></xsl:if></latex>
+		<html>
+			<H1><xsl:apply-templates/></H1>
+		</html>
+	</template>
+	
+	<template name="document-author" match="document/author"/>
+	<template name="document-date" match="document/date"/>
+
 	<!--
 		Generate some number of "sub" so we can produce, e.g., "subsubsection"
 		for LaTeX.
@@ -237,44 +269,33 @@
 	-->
 	<template name="generate-subs">
 		<latex>
-			<xsl:param name="depth">0</xsl:param>
-			<xsl:if test="$depth &gt; 0">
+			<xsl:param name="depth">1</xsl:param>
+			<xsl:if test="$depth &gt; 1">
 				<xsl:text>sub</xsl:text>
-				<xsl:call-template select="generate-subs">
-					<xsl:with-param><xsl:value-of select="$depth - 1"/></xsl:with-param>
+				<xsl:call-template name="generate-subs">
+					<xsl:with-param name="depth"><xsl:value-of select="$depth - 1"/></xsl:with-param>
 				</xsl:call-template>
 			</xsl:if>
 		</latex>
 	</template>
 	
-	<template name="window-title" match="document/title" mode="window-title">
-		<html>
-			<xsl:apply-templates/>
-		</html>
-	</template>
-
-	<template name="document-title" match="document/title">
-	<!-- Need to do something sensible for LaTeX here. -->
-<!-- 		<latex><xsl:apply-templates/></latex> -->
-		<html>
-			<H1><xsl:apply-templates/></H1>
-		</html>
-	</template>
-
 	<template name="section-title" match="section/title">
 		<latex>
+			<xsl:param name="label"/>
 			<xsl:text>\</xsl:text>
 			<!-- Depth calculation for LaTeX hasn't been tested! -->
 			<xsl:call-template name="generate-subs">
 				<xsl:with-param name="depth">
 					<xsl:number value="count(ancestor::section)"/>
-					<xsl:if test="count(ancestor::section) &gt; 2">2</xsl:if>
+					<xsl:if test="count(ancestor::section) &gt; 3">3</xsl:if>
 				</xsl:with-param>
 			</xsl:call-template>
-			<xsl:text>section</xsl:text>
-			<xsl:apply-templates/><xsl:text>}
-
-</xsl:text></latex>
+			<xsl:text>section{</xsl:text>
+			<xsl:apply-templates/><xsl:text>}</xsl:text>
+			<xsl:if test="$label != 'THERE_IS_NO_LABEL'">
+				\label{<xsl:value-of select="$label"/>}
+			</xsl:if>
+		</latex>
 		<html>
 			<xsl:variable name="depth">
 				<xsl:number value="1 + count(ancestor::section)"/>
@@ -424,10 +445,9 @@
 
 	<!-- References. -->
 	<template name="reference" match="reference">
-		<latex></latex>
-		<html>
+		<common>
 			<xsl:apply-templates select="//*[@label = current()/@label]" mode="reference"/>
-		</html>
+		</common>
 	</template>
 	
 	<template name="section-reference" match="section" mode="reference">
