diff --git a/format-master.xml b/format-master.xml
index 1c4e07f..222271c 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -1975,19 +1975,13 @@
 	<template name="preamble-title" match="document/title" mode="preamble">
 		<common formats="/latex/xelatex/">
 			<xsl:text>\title{</xsl:text>
-			<xsl:choose>
-				<xsl:when test="/document/@class = 'assignment'">
-					<xsl:if test="$showanswers='yes'">Sample Solution for </xsl:if>
-				</xsl:when>
-			</xsl:choose>
-			<xsl:call-template name="PaperCode" />
-			<xsl:choose>
-				<xsl:when test="/document/@class = 'assignment'">
-					<xsl:text> Assignment </xsl:text>
-				</xsl:when>
-			</xsl:choose>
-			<xsl:value-of select="/document/@sequence-number" />
-			<xsl:text>: \\</xsl:text>
+			<xsl:if test="/document/@class = 'assignment'">
+				<xsl:if test="$showanswers='yes'">Sample Solution for </xsl:if>
+				<xsl:call-template name="PaperCode" />
+				<xsl:text> Assignment </xsl:text>
+				<xsl:value-of select="/document/@sequence-number" />
+				<xsl:text>: \\</xsl:text>
+			</xsl:if>
 			<xsl:apply-templates />
 			<xsl:text>}</xsl:text>
 		</common>
@@ -1995,30 +1989,32 @@
 			For HTML, strip out any raw HTML formatting (e.g., emphasis), as this is not interpreted within the <title> tag, resulting in raw HTML markup in the window title. Ick. We do this by switching to "strip" mode.
 		-->
 		<common formats="/html/xhtml/">
-			<xsl:if test="$showanswers='yes'">
+			<xsl:if test="( /document/@class = 'tutorial' ) or ( /document/@class = 'laboratory' ) or ( /document/@class = 'assignment' )">
+				<xsl:if test="$showanswers='yes'">
+					<xsl:choose>
+						<xsl:when test="( /document/@class = 'tutorial' ) or ( /document/@class = 'laboratory' )">
+							<xsl:text>Selected Answers for </xsl:text>
+						</xsl:when>
+						<xsl:when test="/document/@class = 'assignment'">
+							<xsl:text>Sample Solution for </xsl:text>
+						</xsl:when>
+					</xsl:choose>
+				</xsl:if>
+				<xsl:call-template name="PaperCode" />
 				<xsl:choose>
-					<xsl:when test="( /document/@class = 'tutorial' ) or ( /document/@class = 'laboratory' )">
-						<xsl:text>Selected Answers for </xsl:text>
+					<xsl:when test="/document/@class = 'tutorial'">
+						<xsl:text> Tutorial </xsl:text>
+					</xsl:when>
+					<xsl:when test="/document/@class = 'laboratory'">
+						<xsl:text> Lab </xsl:text>
 					</xsl:when>
 					<xsl:when test="/document/@class = 'assignment'">
-						<xsl:text>Sample Solution for </xsl:text>
+						<xsl:text> Assignment </xsl:text>
 					</xsl:when>
 				</xsl:choose>
+				<xsl:value-of select="/document/@sequence-number" />
+				<xsl:text>: </xsl:text>
 			</xsl:if>
-			<xsl:call-template name="PaperCode" />
-			<xsl:choose>
-				<xsl:when test="/document/@class = 'tutorial'">
-					<xsl:text> Tutorial </xsl:text>
-				</xsl:when>
-				<xsl:when test="/document/@class = 'laboratory'">
-					<xsl:text> Lab </xsl:text>
-				</xsl:when>
-				<xsl:when test="/document/@class = 'assignment'">
-					<xsl:text> Assignment </xsl:text>
-				</xsl:when>
-			</xsl:choose>
-			<xsl:value-of select="/document/@sequence-number" />
-			<xsl:text>: </xsl:text>
 			<xsl:apply-templates mode="strip" />
 		</common>
 	</template>
@@ -2044,30 +2040,32 @@
 		</common>
 		<common formats="/html/xhtml/">
 			<h1>
-				<xsl:if test="$showanswers='yes'">
+				<xsl:if test="( /document/@class = 'tutorial' ) or ( /document/@class = 'laboratory' ) or ( /document/@class = 'assignment' )">
+					<xsl:if test="$showanswers='yes'">
+						<xsl:choose>
+							<xsl:when test="( /document/@class = 'tutorial' ) or ( /document/@class = 'laboratory' )">
+								<xsl:text>Selected Answers for </xsl:text>
+							</xsl:when>
+							<xsl:when test="/document/@class = 'assignment'">
+								<xsl:text>Sample Solution for </xsl:text>
+							</xsl:when>
+						</xsl:choose>
+					</xsl:if>
+					<xsl:call-template name="PaperCode" />
 					<xsl:choose>
-						<xsl:when test="( /document/@class = 'tutorial' ) or ( /document/@class = 'laboratory' )">
-							<xsl:text>Selected Answers for </xsl:text>
+						<xsl:when test="/document/@class = 'tutorial'">
+							<xsl:text> Tutorial </xsl:text>
+						</xsl:when>
+						<xsl:when test="/document/@class = 'laboratory'">
+							<xsl:text> Lab </xsl:text>
 						</xsl:when>
 						<xsl:when test="/document/@class = 'assignment'">
-							<xsl:text>Sample Solution for </xsl:text>
+							<xsl:text> Assignment </xsl:text>
 						</xsl:when>
 					</xsl:choose>
+					<xsl:value-of select="/document/@sequence-number" />
+					<xsl:text>: </xsl:text>
 				</xsl:if>
-				<xsl:call-template name="PaperCode" />
-				<xsl:choose>
-					<xsl:when test="/document/@class = 'tutorial'">
-						<xsl:text> Tutorial </xsl:text>
-					</xsl:when>
-					<xsl:when test="/document/@class = 'laboratory'">
-						<xsl:text> Lab </xsl:text>
-					</xsl:when>
-					<xsl:when test="/document/@class = 'assignment'">
-						<xsl:text> Assignment </xsl:text>
-					</xsl:when>
-				</xsl:choose>
-				<xsl:value-of select="/document/@sequence-number" />
-				<xsl:text>: </xsl:text>
 				<xsl:apply-templates />
 			</h1>
 		</common>
@@ -2868,24 +2866,36 @@
 
 
 	<!--
-		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.
+		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]
+		@label: The label of the item that we're referencing. It must be a valid label in both LaTeX and HTML. [required]
+		
+		@include-pageref: If "yes", also append a page reference (LaTeX only; this is handled by the "item-page-reference" template below).
 	-->
-	<template name="reference" match="reference">
+	<template name="reference" match="reference[@label]">
 		<common>
 			<!-- Find the element whose label is the same as our label. -->
 			<xsl:apply-templates select="//*[@label = current()/@label]" mode="reference" />
+			<xsl:if test="@include-pageref = 'yes'">
+				<xsl:apply-templates select="//*[@label = current()/@label]" mode="page-reference" />
+			</xsl:if>
 		</common>
 	</template>
 	
-	<!-- Do a separate template for each type of reference; easier. -->
+	<template name="broken-reference" match="reference[not( @label )]">
+		<common>
+			<xsl:message terminate="yes">Reference elements must include a label attribute.</xsl:message>
+		</common>
+	</template>
+	
+	<!-- Do a separate template for each type of referenced item; 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. -->
-		<common formats="/latex/xelatex/">Section~\ref*{<xsl:value-of select="@label" />}</common>
+		<common formats="/latex/xelatex/">
+			<xsl:text>Section~\ref*{</xsl:text>
+			<xsl:value-of select="@label" />
+			<xsl:text>}</xsl:text>
+		</common>
 		<common formats="/html/xhtml/">
 			<xsl:text disable-output-escaping="yes">Section&amp;nbsp;</xsl:text>
 			<xsl:number count="section" level="multiple" format="1.1.1.1.1.1" />
@@ -2893,7 +2903,11 @@
 	</template>
 	
 	<template name="figure-reference" match="figure" mode="reference">
-		<common formats="/latex/xelatex/">Figure~\ref*{<xsl:value-of select="@label" />}</common>
+		<common formats="/latex/xelatex/">
+			<xsl:text>Figure~\ref*{</xsl:text>
+			<xsl:value-of select="@label" />
+			<xsl:text>}</xsl:text>
+		</common>
 		<common formats="/html/xhtml/">
 			<xsl:text disable-output-escaping="yes">Figure&amp;nbsp;</xsl:text>
 			<xsl:choose>
@@ -2908,7 +2922,11 @@
 	</template>
 	
 	<template name="table-reference" match="table" mode="reference">
-		<common formats="/latex/xelatex/">Table~\ref*{<xsl:value-of select="@label" />}</common>
+		<common formats="/latex/xelatex/">
+			<xsl:text>Table~\ref*{</xsl:text>
+			<xsl:value-of select="@label" />
+			<xsl:text>}</xsl:text>
+		</common>
 		<common formats="/html/xhtml/">
 			<xsl:text disable-output-escaping="yes">Table&amp;nbsp;</xsl:text>
 			<xsl:choose>
@@ -2922,13 +2940,85 @@
 		</common>
 	</template>
 	
+	<!--
+		Standalone direct reference to a page (i.e., not associated with some other item like a figure or table). This only really makes sense in LaTeX, as HTML doesn't have page numbers. For HTML, we fudge things by inserting the string "here", which will make sense if the reference is wrapped with a hyperlink (as they usually are).
+	-->
+	<template name="page-reference" match="page[@label]" mode="reference">
+		<common formats="/latex/xelatex/">
+			<xsl:text>page~\pageref{</xsl:text>
+			<xsl:value-of select="@label" />
+			<xsl:text>}</xsl:text>
+		</common>
+		<common formats="/html/xhtml/">
+			<xsl:text disable-output-escaping="yes">here</xsl:text>
+		</common>
+	</template>
 	
-	<!-- Figures & tables (in the LaTeX sense, i.e., "floating" items). -->
+	<!--
+		Common template for appended page references, as they're identical for all items except for standalone page references, which aren't included in this template. The include-pageref attribute is therefore ignored on standalone page references.
+	-->
+	<template name="item-page-reference" match="section|figure|table" mode="page-reference">
+		<common formats="/latex/xelatex/">
+			<xsl:text> on page~\pageref{</xsl:text>
+			<xsl:value-of select="@label" />
+			<xsl:text>}</xsl:text>
+		</common>
+	</template>
+	
+	<!--
+		Generate a standalone label for use in direct page references.
+		
+		TODO: Hmm, this seems to generate the correct page number in LaTeX but the hyperlink is to the wrong page (one lower?). Something to worry about later.
+		
+		@label: The label to be inserted. It must be a valid label in both LaTeX and HTML. [required]
+	-->
+	<template name="page" match="page[@label]">
+		<common formats="/latex/xelatex/">
+			<xsl:text>\label{</xsl:text>
+			<xsl:value-of select="@label" />
+			<xsl:text>}</xsl:text>
+		</common>
+		<common formats="/html/xhtml/">
+			<a id="{@label}"></a>
+		</common>
+	</template>
+	
+	<template name="broken-page" match="page[not( @label )]">
+		<common>
+			<xsl:message terminate="yes">Page elements must include a label attribute.</xsl:message>
+		</common>
+	</template>
+	
+	
+	<!--
+		Figures & tables (in the LaTeX sense, i.e., "floating" items).
+		
+		@border-placement: The style of border to place around the figure or table.
+			'none' [default]
+			'box'
+			or: any combination of 'top', 'left', 'bottom', 'right', e.g., 'bottom, left' (not all options may be available)
+	-->
 	<template name="figure" match="figure">
 		<common formats="/latex/xelatex/">
 			\begin{figure}<xsl:if test="@latex-placement">[<xsl:value-of select="@latex-placement" />]</xsl:if>
 				\centering
+				<xsl:choose>
+					<xsl:when test="@border-placement = 'box'">
+						<xsl:text>\fbox{</xsl:text>
+					</xsl:when>
+					<xsl:when test="contains( @border-placement, 'top' )">
+						<xsl:text>\hrule\medskip</xsl:text>
+					</xsl:when>
+				</xsl:choose>
 				<xsl:apply-templates select="*[not(self::caption)]" />
+				<xsl:choose>
+					<xsl:when test="@border-placement = 'box'">
+						<xsl:text>}</xsl:text>
+					</xsl:when>
+					<xsl:when test="contains( @border-placement, 'bottom' )">
+						<xsl:text>\medskip\hrule</xsl:text>
+					</xsl:when>
+				</xsl:choose>
 				<xsl:if test="count(caption) != 0">
 					\caption{<xsl:apply-templates select="caption" />}
 					<xsl:if test="@label">\label{<xsl:value-of select="@label" />}</xsl:if>
@@ -2938,9 +3028,28 @@
 		</common>
 		<common formats="/html/xhtml/">
 			<div class="figure" style="text-align: center; margin-top: 2em; margin-bottom: 2em;">
-				<xsl:if test="@label"><a id="{@label}"></a></xsl:if>
-				<xsl:if test="count(id) != 0"><a id="{id}"></a></xsl:if>
-				<xsl:apply-templates select="*[not(self::caption)]" />
+				<div>
+					<xsl:attribute name="style">
+						<xsl:if test="@border-placement = 'box'">
+							<xsl:text>border: 1px solid black; padding: 1em; </xsl:text>
+						</xsl:if>
+						<xsl:if test="contains( @border-placement, 'top' )">
+							<xsl:text>border-top: 1px solid black; padding-top: 1em; </xsl:text>
+						</xsl:if>
+						<xsl:if test="contains( @border-placement, 'left' )">
+							<xsl:text>border-left: 1px solid black; padding-left: 1em; </xsl:text>
+						</xsl:if>
+						<xsl:if test="contains( @border-placement, 'bottom' )">
+							<xsl:text>border-bottom: 1px solid black; padding-bottom: 1em; </xsl:text>
+						</xsl:if>
+						<xsl:if test="contains( @border-placement, 'right' )">
+							<xsl:text>border-right: 1px solid black; padding-right: 1em; </xsl:text>
+						</xsl:if>
+					</xsl:attribute>
+					<xsl:if test="@label"><a id="{@label}"></a></xsl:if>
+					<xsl:if test="count(id) != 0"><a id="{id}"></a></xsl:if>
+					<xsl:apply-templates select="*[not(self::caption)]" />
+				</div>
 				<xsl:if test="count(caption) != 0">
 					<br />
 					<xsl:apply-templates select="caption" />
@@ -2953,7 +3062,24 @@
 		<common formats="/latex/xelatex/">
 			\begin{table}<xsl:if test="@latex-placement">[<xsl:value-of select="@latex-placement" />]</xsl:if>
 				\centering
+				<xsl:choose>
+					<!-- TODO: test this with embedded tabulars. It might not work! -->
+					<xsl:when test="@border-placement = 'box'">
+						<xsl:text>\fbox{</xsl:text>
+					</xsl:when>
+					<xsl:when test="contains( @border-placement, 'top' )">
+						<xsl:text>\hrule\medskip</xsl:text>
+					</xsl:when>
+				</xsl:choose>
 				<xsl:apply-templates select="*[not(self::caption)]" />
+				<xsl:choose>
+					<xsl:when test="@border-placement = 'box'">
+						<xsl:text>}</xsl:text>
+					</xsl:when>
+					<xsl:when test="contains( @border-placement, 'bottom' )">
+						<xsl:text>\medskip\hrule</xsl:text>
+					</xsl:when>
+				</xsl:choose>
 				<xsl:if test="count(caption) != 0">
 					\caption{<xsl:apply-templates select="caption" />}
 					<xsl:if test="@label">\label{<xsl:value-of select="@label" />}</xsl:if>
@@ -2962,6 +3088,28 @@
 		</common>
 		<common formats="/html/xhtml/">
 			<div class="table" style="text-align: center; margin-top: 2em; margin-bottom: 2em;">
+				<div>
+					<xsl:attribute name="style">
+						<xsl:if test="@border-placement = 'box'">
+							<xsl:text>border: 1px solid black; padding: 1em; </xsl:text>
+						</xsl:if>
+						<xsl:if test="contains( @border-placement, 'top' )">
+							<xsl:text>border-top: 1px solid black; padding-top: 1em; </xsl:text>
+						</xsl:if>
+						<xsl:if test="contains( @border-placement, 'left' )">
+							<xsl:text>border-left: 1px solid black; padding-left: 1em; </xsl:text>
+						</xsl:if>
+						<xsl:if test="contains( @border-placement, 'bottom' )">
+							<xsl:text>border-bottom: 1px solid black; padding-bottom: 1em; </xsl:text>
+						</xsl:if>
+						<xsl:if test="contains( @border-placement, 'right' )">
+							<xsl:text>border-right: 1px solid black; padding-right: 1em; </xsl:text>
+						</xsl:if>
+					</xsl:attribute>
+					<xsl:if test="@label"><a id="{@label}"></a></xsl:if>
+					<xsl:if test="count(id) != 0"><a id="{id}"></a></xsl:if>
+					<xsl:apply-templates select="*[not(self::caption)]" />
+				</div>
 				<xsl:if test="@label"><a id="{@label}"></a></xsl:if>
 				<xsl:apply-templates select="*[not(self::caption)]" />
 				<xsl:if test="count(caption) != 0">
@@ -2977,7 +3125,24 @@
 			<xsl:for-each select="part">
 				\begin{table}[p]
 					\centering
+					<xsl:choose>
+						<!-- TODO: test this with embedded tabulars. It might not work! -->
+						<xsl:when test="../@border-placement = 'box'">
+							<xsl:text>\fbox{</xsl:text>
+						</xsl:when>
+						<xsl:when test="contains( ../@border-placement, 'top' )">
+							<xsl:text>\hrule\medskip</xsl:text>
+						</xsl:when>
+					</xsl:choose>
 					<xsl:apply-templates />
+					<xsl:choose>
+						<xsl:when test="../@border-placement = 'box'">
+							<xsl:text>}</xsl:text>
+						</xsl:when>
+						<xsl:when test="contains( ../@border-placement, 'bottom' )">
+							<xsl:text>\medskip\hrule</xsl:text>
+						</xsl:when>
+					</xsl:choose>
 					<xsl:if test="count(../caption) != 0">
 						<xsl:text>\caption{</xsl:text>
 						<xsl:apply-templates select="../caption" />