diff --git a/format-master.xml b/format-master.xml
index 2764c28..5d7abbf 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -21,7 +21,14 @@
 		<html>Oracle9<I>i</I></html>
 	</template>
 
-
+	<!--
+		Plain paragraph.
+		
+		@indent: Whether or not to indent this paragraph (probably only
+		relevant in LaTeX).
+			'no' => don't indent.
+			otherwise => apply standard paragraph formatting. [default]
+	-->
 	<template name="paragraph" match="paragraph">
 		<latex><xsl:text>
 
@@ -114,7 +121,6 @@
 		<latex>\copyright</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#169;</xsl:text></html>
 	</template>
-	<!--	<alias source="copyright" target="copyright-sign"/> -->
 
 	<template name="degree-sign" match="degree-sign">
 		<latex>$^{\circ}$</latex>
@@ -142,7 +148,6 @@
 
 	<template name="LaTeX" match="LaTeX">
 		<latex>{\LaTeX}</latex>
-		<!-- <html>LaTeX</html> -->
 		<html>L<SUP>A</SUP>T<SUB>E</SUB>X</html>
 	</template>
 	<alias source="latex" target="LaTeX"/>
@@ -215,7 +220,13 @@
 	</template>
 
 	
-	<!-- Quoted text. Handles nested quotes correctly. -->
+	<!--
+		Quoted text. Handles nested quotes correctly.
+		
+		@single: Whether to enclose the text in single or double quotes.
+			'yes' => single quotes ('').
+			otherwise => double quotes (""). [default]
+	-->
 	<template name="single-quote" match="quote[@single='yes']">
 		<latex>`<xsl:apply-templates/>'</latex>
 		<html>
@@ -232,6 +243,11 @@
 			<xsl:text disable-output-escaping="yes">&amp;#8221;</xsl:text>
 		</html>
 	</template>
+	<!--
+		With nested quotes, we need to figure out what depth of nesting
+		we're at, then call the appropriate template depending on
+		the initial quoting style (single or double).
+	-->
 	<template name="nested-double-quote" match="quote//quote">
 		<common>
 			<xsl:choose>
@@ -319,7 +335,7 @@
 				a table be better? Messy if the keyword is long,
 				though, and you don't get a proper hanging indent...
 				
-				Maybe this is something thaty could be handled in CSS 
+				Maybe this is something that could be handled in CSS 
 				instead.
 			-->
 			<DL>
@@ -369,7 +385,7 @@
 	<alias source="topic" target="keyword"/>
 	
 	<!--
-		Need to provide some context here as, e.g., description is also
+		Need to provide some context here as, e.g., <description> is also
 		used within <image>.
 	-->
 	<template name="definition" match="item/definition|item/description|item/discourse">
@@ -386,7 +402,13 @@
 	</template>
 	
 	
-	<!-- Sections, subsections, subsubsections, ... -->
+	<!--
+		Sections, subsections, subsubsections, ...
+		
+		@label: A label that can be used for cross referencing. Any
+		value can be used, as long as it's a legal identifier in both
+		LaTeX and HTML.
+	-->
 	<template name="section" match="section">
 		<latex>
 			<xsl:apply-templates>
@@ -399,6 +421,9 @@
 		<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"/>
@@ -446,6 +471,7 @@
 				<xsl:text> </xsl:text>
 				<xsl:apply-templates/>
 				<xsl:text> </xsl:text>
+				<!-- Provide a back link to the original footnote marker. -->
 				<A>
 					<xsl:attribute name="HREF">
 						<xsl:text>#footnote-</xsl:text>
@@ -487,13 +513,12 @@
 	<template name="document-date" match="document/date"/>
 
 	<!--
-		Generate some number of "sub" so we can produce, e.g., "subsubsection"
-		for LaTeX.
+		Generate some number of "sub"s so we can produce, e.g.,
+		"subsubsection" for LaTeX.
 		
-		Parameter: $depth
-		Meaning: the number of repetitions (0 <= $depth <= 2, but there's no
-		need to do bounds checking at the upper end, because that's already
-		dealt with in the "section-title" template below).
+		$depth: the number of repetitions (0 <= $depth <= 2, but there's
+		no need to do bounds checking at the upper end, because that's
+		already dealt with in the "section-title" template below).
 	-->
 	<template name="generate-subs">
 		<latex>
@@ -507,11 +532,12 @@
 		</latex>
 	</template>
 	
+	<!-- Generate section title with nested numbering, e.g., 1.1.3. -->
 	<template name="section-title" match="section/title">
 		<latex>
 			<xsl:param name="label"/>
 			<xsl:text>\</xsl:text>
-			<!-- Depth calculation for LaTeX hasn't been tested! -->
+			<!-- Generate the correct number of "sub"s for LaTeX. -->
 			<xsl:call-template name="generate-subs">
 				<xsl:with-param name="depth">
 					<xsl:number value="count(ancestor::section)"/>
@@ -525,6 +551,7 @@
 			</xsl:if>
 		</latex>
 		<html>
+			<!-- The depth is used in a couple of places, so we pre-calculate it. -->
 			<xsl:variable name="depth">
 				<xsl:number value="1 + count(ancestor::section)"/>
 				<xsl:if test="1 + count(ancestor::section) &gt; 6">6</xsl:if>
@@ -538,8 +565,16 @@
 	</template>
 
 
-	<!-- A quotation. -->
+	<!--
+		A quotation.
+		
+		@align: The alignment of the quotation paragraph.
+			'left' [default]
+			'center'
+			'right'
+	-->
 	<template name="quotation" match="quotation">
+		<!-- Should we be using a quotation environment? -->
 		<latex>
 			<xsl:choose>
 				<xsl:when test="(@align = 'left') or (@align = 'right')">
@@ -553,6 +588,7 @@
 				</xsl:otherwise>
 			</xsl:choose>
 		</latex>
+		<!-- Nominally we should use <BLOCKQUOTE>, but it doesn't have alignment. -->
 		<html>
 			<P>
 				<xsl:if test="@align">
@@ -567,15 +603,15 @@
 	
 	
 	<!--
-		Anything inside an ID element is ignored completely. (More accurately,
-		we pick bits out of it manually as required; it's only ignored by
-		apply-templates.)
+		Anything inside a <metadata> is ignored completely. (More
+		accurately, we pick bits out of it manually as required; it's
+		only ignored by apply-templates.)
 	-->
-	<template name="id" match="id"/>
+	<template name="metadata" match="metadata"/>
 	
 	
 	<!--
-		Anything inside an OMIT element is also ignored completely.
+		Anything inside an <omit> is also ignored completely.
 	-->
 	<template name="omit" match="omit"/>
 
@@ -599,9 +635,19 @@
 	</template>
 	
 	
-	<!-- Tabular structures (LaTeX {tabular}, HTML <TABLE>). -->
+	<!--
+		Tabular structures (LaTeX {tabular}, HTML <TABLE>).
+		
+		@align: The alignment of the table as a whole.
+			'left' [default]
+			'center'
+			'right'
+		
+		@border: Width of cell border for HTML tables.
+	-->
 	<template name="tabular" match="tabular">
 		<latex>
+			<!-- Overall table alignment. -->
 			<xsl:text>\begin{</xsl:text>
 			<xsl:choose>
 				<xsl:when test="(@align = 'left') or (@align = 'right')">
@@ -656,7 +702,27 @@
 		</html>
 	</template>
 	
-	<!-- Set left- or right-border to "|" to include a column separator. -->
+	<!--
+		Specify column formatting, mainly for LaTeX, although
+		HTML does get <TD> ALIGN values from here.
+		
+		@align: The alignment of this particular column.
+			'left' [default]
+			'center'
+			'right'
+		
+		@left-border: Set to '|' to include a column separator to the
+		left of this column.
+
+		@right-border: Set to '|' to include a column separator to the
+		right of this column.
+		
+		Careful: including a right-border on a cell and a left-border on
+		the next cell will produce '||', not '|'. BUT, when doing
+		multi-column or multi-row cells, always include both borders if
+		required, because \multicolumn overrides the default border
+		specification.
+	-->
 	<template name="aligned-column" match="column[@align]">
 		<latex>
 			<xsl:value-of select="@left-border"/>
@@ -664,7 +730,7 @@
 			<xsl:value-of select="@right-border"/>
 		</latex>
 	</template>
-	
+
 	<template name="unaligned-column" match="column[not(@align)]">
 		<latex>
 			<xsl:value-of select="@left-border"/>
@@ -700,6 +766,9 @@
 		</html>
 	</template>
 
+	<!--
+		@no-page-break: Inhibit page breaks after this row (LaTeX only).
+	-->
 	<template name="row" match="row">
 		<latex><xsl:apply-templates/> \\<xsl:if test="@no-page-break = 'yes'">*</xsl:if><xsl:text> </xsl:text></latex>
 		<html>
@@ -709,15 +778,39 @@
 		</html>
 	</template>
 
+	<!--
+		Horizontal rules (LaTeX only).
+		
+		@columns: The column range to draw the rule across. Specify as
+		you would for a \cline in LaTeX, e.g., '3-5'. If omitted, the
+		rule is drawn across all columns.
+	-->
 	<template name="row-rule-full" match="row-rule[not(@columns)]">
-		<latex>\hline</latex>
+		<latex><xsl:text>\hline </xsl:text></latex>
 	</template>
 
 	<template name="row-rule-partial" match="row-rule[@columns]">
 		<latex>\cline{<xsl:value-of select="@columns"/>}</latex>
 	</template>
 	
-	<template match="cell" mode="multi-row">
+	<!--
+		Hmm, the multi-row stuff is somewhat broken in LaTeX, oops.
+		Need to insert missing columns (as was done in the calendar
+		XSL) when a multi-row cell is encountered.
+		
+		Also need to sort out \hlines in the presence of multi-row cells
+		and also what happens to vertical cell borders :(
+		
+		This probably needs reworking.
+	-->
+	
+	<!--
+		Multi-row cells (LaTeX only, as this is pretty trivial to
+		achieve in HTML).
+		
+		@rows: The number of rows this cell spans.
+	-->
+	<template name="multirow-cell" match="cell" mode="multi-row">
 		<latex>
 			<xsl:text>\multirow{</xsl:text>
 			<xsl:value-of select="@rows"/>
@@ -727,7 +820,13 @@
 		</latex>
 	</template>
 	
-	<template match="cell" mode="multi-column">
+	<!--
+		Multi-column cells (LaTeX only, as this is pretty trivial to
+		achieve in HTML).
+		
+		$num-columns: The number of rows this cell spans.
+	-->
+	<template name="multicolumn-cell" match="cell" mode="multi-column">
 		<latex>
 			<xsl:param name="num-columns">1</xsl:param>
 			<xsl:text>\multicolumn{</xsl:text>
@@ -736,7 +835,7 @@
 			<xsl:value-of select="@left-border"/>
 			<xsl:choose>
 				<xsl:when test="@align">
-					<xsl:value-of select="@align"/>
+					<xsl:value-of select="substring(@align, 1, 1)"/>
 				</xsl:when>
 				<xsl:otherwise>
 					<xsl:text>l</xsl:text>
@@ -758,7 +857,7 @@
 	
 	<template match="cell">
 		<common>
-			<!-- position() doesn't seem to work very well in this context -->
+			<!-- position() doesn't seem to work very well in this context. -->
 			<xsl:variable name="column-no"><xsl:number/></xsl:variable>
 		</common>
 		<!--
@@ -815,7 +914,15 @@
 	</template>
 	
 	
-	<!-- Hyperlinks. -->
+	<!--
+		Hyperlinks. The content of the element is the hyperlink text.
+		
+		@label: A label that the hyperlink links to. The value should
+		be an acceptable label in both LaTeX and HTML. [optional]
+		
+		@url: A URL that the hyperlink links to. If no link text is
+		provided, the URL is used as the link text. [optional]
+	-->
 	<template name="hyperlink-label" match="hyperlink[@label]">
 		<latex>\hyperref[<xsl:value-of select="@label"/>]{<xsl:apply-templates/>}</latex>
 		<html><A HREF="#{@label}"><xsl:apply-templates/></A></html>
@@ -826,14 +933,13 @@
 		<html><A HREF="{@url}"><xsl:apply-templates/></A></html>
 	</template>
 
-	<!-- An empty <hyperlink> element with a URL defaults to the URL as the link text. -->
 	<template name="empty-hyperlink-url" match="hyperlink[@url and not(node())]">
 		<!-- Maybe we should be using the url package and \url{...}? -->
 		<latex>\href{<xsl:value-of select="@url"/>}{\texttt{<xsl:value-of select="@url"/>}}</latex>
 		<html><A HREF="{@url}"><CODE><xsl:value-of select="@url"/></CODE></A></html>
 	</template>
 	
-	<!-- A plain URL. -->
+	<!-- A plain URL (i.e., not necessarily a hyperlink). -->
 	<template name="url" match="url">
 		<!-- Maybe we should be using the url package and \url{...}? -->
 		<latex>\texttt{<xsl:apply-templates/>}</latex>
@@ -845,7 +951,14 @@
 	<alias source="email-address" target="url"/>
 
 
-	<!-- References. -->
+	<!--
+		References. Note the distinction betwen these and hyperlinks: a
+		reference is merely something like "see Section 2.3", and
+		doesn't necessarily imply a hyperlink, or vice versa.
+		
+		@label: The label of the item that we're referencing. It must be
+		a valid label in both LaTeX and HTML. [required]
+	-->
 	<template name="reference" match="reference">
 		<common>
 			<!-- Find the element whose label is the same as our label. -->
@@ -853,6 +966,7 @@
 		</common>
 	</template>
 	
+	<!-- Do a separate template for each type of reference; easier. -->
 	<template name="section-reference" match="section" mode="reference">
 		<!-- It's probably more consistent to just use \ref* and insert "Section" ourselves rather than let LaTeX do it. -->
 		<latex>Section~\ref*{<xsl:value-of select="@label"/>}</latex>
@@ -879,7 +993,7 @@
 	</template>
 	
 	
-	<!-- Figures & tables. -->
+	<!-- Figures & tables (in the LaTeX sense, i.e., "floating" items). -->
 	<template name="figure" match="figure">
 		<latex>
 			\begin{figure}
@@ -941,10 +1055,20 @@
 	</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 (a la LaTeX [width] parameter). -->
-	<!-- To do: if no description is given, use the basename as the content of the ALT element. -->
-	<!-- Ideally, I think we should be able to define two image formats (PDF, EPS, PNG, ...) when marking up an image: one for LaTeX output, another for HTML. -->
-
+	<!--
+		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).
+		How about a <latex-attributes> element that can be used to specify \includegraphics arguments?
+			<width keepaspectratio="yes">0.5\columnwidth</width>
+			<height>2cm</height>
+			<scale>0.5</scale>
+			etc.
+		
+		To do: if no description is given, use the basename as the content of the ALT element.
+		Ideally, I think we should be able to define two image formats (PDF, EPS, PNG, ...) when marking up an image: one for LaTeX output, another for HTML.
+	-->
+	
 	<!-- LaTeX images are always handled the same way regardless. -->
 	<template match="image" mode="latex">
 		<latex>
@@ -956,11 +1080,12 @@
 			</xsl:if>
 			<!-- Use whatever standard image folder is appropriate for the context. -->
 			<xsl:choose>
+				<!-- Could possibly change this to test="/document/@class = 'tutorial'" or similar? -->
 				<xsl:when test="name(/child::node()[1])='tutorial'">
-					<xsl:text>{\tutroot/</xsl:text><xsl:value-of select="/tutorial/id/number-code"/><xsl:text>-</xsl:text><xsl:value-of select="/tutorial/id/title-code"/><xsl:text>/Graphics/</xsl:text>
+					<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>
 				<xsl:when test="name(/child::node()[1])='laboratory'">
-					<xsl:text>{\labroot/</xsl:text><xsl:value-of select="/laboratory/id/number-code"/><xsl:text>-</xsl:text><xsl:value-of select="/laboratory/id/title-code"/><xsl:text>/Graphics/</xsl:text>
+					<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>
 				<xsl:otherwise>
 					<xsl:text>{images/</xsl:text>
@@ -1065,7 +1190,7 @@
 		processor seems to always generate a DOCTYPE when producing
 		HTML, whether you want it or not. Maybe you can turn this off?
 		
-		@file: Name of file to include. REQUIRED.
+		@file: Name of file to include. [required]
 	-->
 	<template name="include-xml" match="include-document">
 		<common>
@@ -1085,12 +1210,17 @@
 		You can also define environment entries inline by omitting
 		the file attribute.
 		
-		@file: Name of environment file. OPTIONAL.
+		@file: Name of environment file. [optional]
 	-->
 	<template name="environment" match="environment[@file]">
 		<xsl:apply-templates select="document(@file)/environment/*"/>
 	</template>
 	
+	<!--
+		Load a LaTeX package.
+		
+		@options: Any arguments to the package. [optional]
+	-->
 	<template name="latex-package" match="latex-packages/package">
 		<latex>\usepackage<xsl:if test="@options">[<xsl:value-of select="@options"/>]</xsl:if>{<xsl:value-of select="."/>}</latex>
 	</template>
@@ -1116,9 +1246,13 @@
 
 	
 	<!--
-		Conditional processing depending on the format.
+		Conditional processing depending on the format. It may appear
+		redundant to have two templates, but this is the only way to
+		ensure that the LaTeX template is empty in the HTML style sheet,
+		and vice versa.
 		
 		@format: the format under which this XML is to be processed.
+		[required]
 	-->
 	<template name="process-when-latex" match="process-when[@format = 'latex']">
 		<latex><xsl:apply-templates/></latex>
@@ -1221,9 +1355,12 @@
 	</template>
 	
 	<!--
-		We'll assume the names used by LaTeX here, as they work out correct
-		anyway. There's actually nothing to stop you using any name you like,
-		except that it'll probably die horribly in LaTeX :)
+		The equivalent of LaTeX's "log-like functions".
+		
+		@name: The name of the function. We assume the names used by
+		LaTeX here, as they work out correct anyway. There's actually
+		nothing to stop you using any name you like, except that it'll
+		probably die horribly in LaTeX :) [required]
 	-->
 	<template name="log-like-function" match="math//function">
 		<latex>\<xsl:value-of select="@name"/></latex>
