diff --git a/format-master.xml b/format-master.xml
index 56e9320..f8a2de5 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -845,6 +845,9 @@
 		</latex>
 		<html>
 			<TR>
+				<xsl:if test="@valign">
+					<xsl:attribute name="VALIGN"><xsl:value-of select="@valign"/></xsl:attribute>
+				</xsl:if>
 				<xsl:apply-templates/>
 			</TR>
 		</html>
@@ -972,6 +975,10 @@
 						<xsl:if test="not(ancestor::tabular/columns/column[position() = $column-no]/@align)">left</xsl:if>
 					</xsl:if>
 				</xsl:attribute>
+				<xsl:attribute name="VALIGN">
+					<xsl:value-of select="@valign"/>
+					<xsl:if test="not(@valign)">middle</xsl:if>
+				</xsl:attribute>
 				<xsl:attribute name="COLSPAN">
 					<xsl:value-of select="@columns"/>
 					<xsl:if test="not(@columns)">1</xsl:if>
@@ -1160,20 +1167,26 @@
 				<xsl:text>]</xsl:text>
 			</xsl:if>
 			<!-- Use whatever standard image folder is appropriate for the context. -->
+			<xsl:text>{</xsl:text>
 			<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' 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: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' 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: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>
+				<!-- Allow the author to specify a non-standard image location on the fly. -->
+				<xsl:when test="count(location) != 0">
+					<xsl:value-of select="location"/>
 				</xsl:when>
 				<!-- new style in progress... -->
 				<xsl:otherwise>
-					<xsl:text>{images/</xsl:text>
+					<xsl:text>images/</xsl:text>
 				</xsl:otherwise>
 			</xsl:choose>
+			<xsl:text>/</xsl:text>
 			<xsl:value-of select="basename"/>
 			<xsl:text>.</xsl:text>
 			<xsl:choose>
