diff --git a/format-master.xml b/format-master.xml
index 69c657f..ee708f5 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -49,10 +49,19 @@
 	
 	<!-- 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><xsl:text> \\</xsl:text></latex>
+	<template name="newline" match="newline|line-break">
+		<latex><xsl:text> \\
+</xsl:text></latex>
 		<html><BR/></html>
 	</template>
+
+	<!-- Whereas newline|line-break is for line breaks intended to be outputted in the final document, this is for additional linebreaks in the generated latex or HTML source (for stuff like avoiding "\end{verbatim}\item" all on one line). -->
+	<template name="newline-internal" match="newline-internal">
+		<latex><xsl:text>
+</xsl:text></latex>
+		<html><xsl:text>
+</xsl:text></html>
+	</template>
 	
 	<template name="page-break" match="page-break|new-page">
 		<latex>\newpage</latex>
@@ -226,9 +235,11 @@
 	<!-- We can decide later whether to use plain verbatim or listings. -->
 	<template name="code-block" match="code-block">
 		<latex>
+			<xsl:call-template name="newline-internal"/>
 			<xsl:text>\begin{verbatim}</xsl:text>
 				<xsl:apply-templates/>
-			<xsl:text>\end{verbatim}</xsl:text>
+				<xsl:text>\end{verbatim}</xsl:text>
+			<xsl:call-template name="newline-internal"/>
 		</latex>
 		<html>
 			<PRE CLASS="code"><xsl:apply-templates/></PRE>
@@ -238,9 +249,11 @@
 	<!-- This is for stuff that should unequivocally be treated verbatim (e.g. problem code). -->
 	<template name="verbatim" match="verbatim">
 		<latex>
+			<xsl:call-template name="newline-internal"/>
 			<xsl:text>\begin{verbatim}</xsl:text>
 				<xsl:apply-templates/>
 			<xsl:text>\end{verbatim}</xsl:text>
+			<xsl:call-template name="newline-internal"/>
 		</latex>
 		<html>
 			<PRE><xsl:apply-templates/></PRE>
@@ -1189,7 +1202,7 @@
 			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.
+		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.  Mind you, if the generation of the various formats from a single master is handled outside of the XSLT processing...?
 	-->
 	
 	<!-- LaTeX images are always handled the same way regardless. -->
@@ -1201,6 +1214,13 @@
 				<xsl:value-of select="latex-scaling"/>
 				<xsl:text>]</xsl:text>
 			</xsl:if>
+			<!-- Adding general-purpose latex pass-through arguments for \includegraphics; this should eventually subsume the "scale"-only handler above. -->
+			<!-- If providing multiple arguments, these should be comma-separated in the source XML, but no not need the enclosing square brackets. -->
+			<xsl:if test="@latex-options">
+				<xsl:text>[</xsl:text>
+				<xsl:value-of select="@latex-options"/>
+				<xsl:text>]</xsl:text>
+			</xsl:if>
 			<!-- Use whatever standard image folder is appropriate for the context. -->
 			<xsl:text>{</xsl:text>
 			<xsl:choose>
@@ -1244,7 +1264,13 @@
 				</xsl:otherwise>
 			</xsl:choose>
 			<xsl:text>/</xsl:text>
-			<xsl:value-of select="basename"/>
+			<!-- need to phase out "basename" as an element and swith to using an attribute -->
+			<xsl:if test="count(basename) != 0">
+				<xsl:value-of select="basename"/>
+			</xsl:if>
+			<xsl:if test="@basename">
+				<xsl:value-of select="@basename"/>
+			</xsl:if>
 			<xsl:text>.</xsl:text>
 			<xsl:choose>
 				<xsl:when test="count(format) != 0">
@@ -1264,7 +1290,7 @@
 			<IMG BORDER="0">
 				<xsl:attribute name="SRC">
 					<xsl:choose>
-						<xsl:when test="(name(/child::node()[1])='tutorial') or (name(/child::node()[1])='laboratory')">
+						<xsl:when test="(name(/child::node()[1])='tutorial') or (name(/child::node()[1])='laboratory') or /document/@class = 'tutorial' or /document/@class = 'laboratory' ">
 							<xsl:text>Graphics/</xsl:text>
 							<xsl:value-of select="basename"/>
 							<xsl:text>-72dpi.png</xsl:text>
@@ -1274,6 +1300,7 @@
 							<xsl:value-of select="basename"/>
 							<xsl:text>.</xsl:text>
 							<xsl:choose>
+								<!-- CME: oops, I'd originally used the "format" tag to identify the format used in the LaTeX version, not the HTML! -->
 								<xsl:when test="count(format) != 0">
 									<xsl:value-of select="format"/>
 								</xsl:when>
