diff --git a/format-master.xml b/format-master.xml
index 3a3851a..fe17adc 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -288,9 +288,18 @@
 			\end{description}
 		</latex>
 		<html>
-			<DL>
+			<!--
+				Hmm, <DL>s in HTML tend to come out with the spacing a
+				bit wrong (or maybe it's just my browser?). Might using
+				a table be better? Messy if the keyword is long,
+				though...
+			-->
+<!-- 			<DL> -->
+<!-- 				<xsl:apply-templates/> -->
+<!-- 			</DL> -->
+			<TABLE BORDER="0" CELLPADDING="10">
 				<xsl:apply-templates/>
-			</DL>
+			</TABLE>
 		</html>
 	</template>
 	
@@ -300,14 +309,27 @@
 	<!-- List elements -->
 	<template name="item" match="item">
 		<latex>\item <xsl:apply-templates/></latex>
-		<html><LI><xsl:apply-templates/></LI></html>
+		<html>
+			<xsl:choose>
+				<xsl:when test="count(paragraph|para|p) != 0">
+					<LI><xsl:apply-templates/></LI>
+				</xsl:when>
+				<xsl:otherwise>
+					<LI><P><xsl:apply-templates/></P></LI>
+				</xsl:otherwise>
+			</xsl:choose>
+		</html>
 	</template>
 
 	<template name="definition-item" match="definition-list/item">
 		<latex>\item[<xsl:apply-templates select="keyword"/>] <xsl:apply-templates select="definition"/></latex>
 		<html>
-			<DT><xsl:apply-templates select="keyword"/></DT>
-			<DD><xsl:apply-templates select="definition|description|discourse"/></DD>
+<!-- 			<DT><P><xsl:apply-templates select="keyword"/></P></DT> -->
+<!-- 			<DD><xsl:apply-templates select="definition|description|discourse"/></DD> -->
+			<TR VALIGN="TOP">
+				<TD><P><xsl:apply-templates select="keyword"/></P></TD>
+				<TD><xsl:apply-templates select="definition|description|discourse"/></TD>
+			</TR>
 		</html>
 	</template>
 	
@@ -318,6 +340,23 @@
 	
 	<alias source="topic" target="keyword"/>
 	
+	<!--
+		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">
+		<html>
+			<xsl:choose>
+				<xsl:when test="count(paragraph|para|p) != 0">
+					<xsl:apply-templates/>
+				</xsl:when>
+				<xsl:otherwise>
+					<P><xsl:apply-templates/></P>
+				</xsl:otherwise>
+			</xsl:choose>
+		</html>
+	</template>
+	
 	
 	<!-- Sections, subsections, subsubsections, ... -->
 	<template name="section" match="section">
@@ -716,7 +755,7 @@
 		<latex>Section~\ref*{<xsl:value-of select="@label"/>}</latex>
 		<html>
 			<xsl:text disable-output-escaping="yes">Section&amp;#160;</xsl:text>
-			<xsl:number count="section" level="multiple" format="1.1.1.1.1.1"/>
+			<xsl:number count="figure" level="multiple" format="1.1.1.1.1.1"/>
 		</html>
 	</template>
 	
@@ -724,7 +763,7 @@
 		<latex>Figure~\ref*{<xsl:value-of select="@label"/>}</latex>
 		<html>
 			<xsl:text disable-output-escaping="yes">Figure&amp;#160;</xsl:text>
-			<xsl:number count="figure" level="multiple" format="1"/>
+			<xsl:number count="figure" level="any" format="1"/>
 		</html>
 	</template>
 	
@@ -732,7 +771,7 @@
 		<latex>Table~\ref*{<xsl:value-of select="@label"/>}</latex>
 		<html>
 			<xsl:text disable-output-escaping="yes">Table&amp;#160;</xsl:text>
-			<xsl:number count="table" level="multiple" format="1"/>
+			<xsl:number count="table" level="any" format="1"/>
 		</html>
 	</template>
 	
@@ -787,42 +826,103 @@
 	<template name="figure-caption" match="figure/caption">
 		<latex><xsl:apply-templates/></latex>
 		<html>
-			<STRONG>Figure <xsl:number count="figure" level="multiple" format="1"/>. </STRONG><xsl:apply-templates/>
+			<STRONG>Figure <xsl:number count="figure" level="any" format="1"/>. </STRONG><xsl:apply-templates/>
 		</html>
 	</template>
 	
 	<template name="table-caption" match="table/caption">
 		<latex><xsl:apply-templates/></latex>
 		<html>
-			<STRONG>Table <xsl:number count="table" level="multiple" format="1"/>. </STRONG><xsl:apply-templates/>
+			<STRONG>Table <xsl:number count="table" level="any" format="1"/>. </STRONG><xsl:apply-templates/>
 		</html>
 	</template>
 	
 	
 	<!-- Images. Includes a scaling factor for LaTeX. -->
-	<template match="image[not(@print-version)]">
+	
+	<!-- LaTeX images are always handled the same way regardless. -->
+	<template match="image" mode="latex">
 		<latex>
-			\includegraphics[scale=<xsl:value-of select="latex-scaling"/>]{images/<xsl:value-of select="basename"/>.<xsl:value-of select="$image-format"/>}
+			<xsl:text>\includegraphics</xsl:text>
+			<xsl:if test="count(latex-scaling) != 0">
+				<xsl:text>[scale=</xsl:text>
+				<xsl:value-of select="latex-scaling"/>
+				<xsl:text>]</xsl:text>
+			</xsl:if>
+			<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:value-of select="$image-format"/>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:text>}</xsl:text>
 		</latex>
+	</template>
+	
+	<template match="image[count(provide-large-version) = 0]">
+		<latex><xsl:apply-templates select="." mode="latex"/></latex>
 		<html>
 			<IMG BORDER="0">
-				<xsl:attribute name="SRC">images/<xsl:value-of select="basename"/>.png</xsl:attribute>
+				<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>
+						<xsl:otherwise>
+							<xsl:text>png</xsl:text>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
 				<xsl:attribute name="ALT"><xsl:apply-templates select="description"/></xsl:attribute>
 			</IMG>
 		</html>
 	</template>
 
-	<template match="image[@print-version = 'yes']">
-		<latex>
-			\includegraphics[scale=<xsl:value-of select="latex-scaling"/>]{images/<xsl:value-of select="basename"/>.<xsl:value-of select="$image-format"/>}
-		</latex>
+	<template match="image[count(provide-large-version) != 0]">
+		<latex><xsl:apply-templates select="." mode="latex"/></latex>
 		<html>
 			<A>
-				<xsl:attribute name="HREF">images/<xsl:value-of select="basename"/>-print.png</xsl:attribute>
+				<xsl:attribute name="HREF">
+					<xsl:text>images/</xsl:text>
+					<xsl:value-of select="basename"/>
+					<xsl:text>-zoom.</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:attribute>
 				<IMG BORDER="0">
-					<xsl:attribute name="SRC">images/<xsl:value-of select="basename"/>.png</xsl:attribute>
-					<xsl:attribute name="ALT"><xsl:apply-templates select="description"/></xsl:attribute>
+					<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>
+							<xsl:otherwise>
+								<xsl:text>png</xsl:text>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:attribute>
+					<xsl:attribute name="ALT">
+						<xsl:apply-templates select="description"/>
+					</xsl:attribute>
 				</IMG>
+				<BR CLEAR="right"/>
+				<xsl:text>(Larger version)</xsl:text>
 			</A>
 		</html>
 	</template>
