diff --git a/format-master.xml b/format-master.xml
index b61825f..2764c28 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -132,9 +132,11 @@
 		<html><xsl:text disable-output-escaping="yes">&amp;#182;</xsl:text></html>
 	</template>
 
-	<!-- I think this might cause problems if it occurs in a math environment context...? -->
+	<!-- I think the pi symbol is only available in LaTeX in math mode, but if we're already in math mode, the extra $ signs will mess things up... -->
+	<!-- Can we use XSLT modes to deal with this? -->
 	<template name="pi" match="pi">
-		<latex>$\pi$</latex>
+		<!-- <latex>$\pi$</latex> -->
+		<latex>\pi</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#960;</xsl:text></html>
 	</template>
 
@@ -941,7 +943,8 @@
 	
 	<!-- 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. -->
+
 	<!-- LaTeX images are always handled the same way regardless. -->
 	<template match="image" mode="latex">
 		<latex>
