diff --git a/format-master.xml b/format-master.xml
index 95e6d6f..ad782d1 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -187,10 +187,18 @@
 
 	<!-- 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... -->
 	<!-- Use \ensuremath to resolve the problem. -->
-	<template name="pi" match="pi">
+	<template name="pi" match="pi|project">
 		<latex>\ensuremath{\pi}</latex>
 		<html><xsl:text disable-output-escaping="yes">&amp;#960;</xsl:text></html>
 	</template>
+	<template name="sigma" match="sigma|restrict">
+		<latex>\ensuremath{\sigma}</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#963;</xsl:text></html>
+	</template>
+	<template name="rho" match="rho|rename">
+		<latex>\ensuremath{\rho}</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#961;</xsl:text></html>
+	</template>
 
 	<template name="LaTeX" match="LaTeX|latex">
 		<latex>{\LaTeX}</latex>
@@ -247,7 +255,7 @@
 
 	<template name="typewriter" match="typewriter|monospace|tt">
 		<latex>\texttt{<xsl:apply-templates/>}</latex>
-		<html><CODE><xsl:apply-templates/></CODE></html>
+		<html><TT><xsl:apply-templates/></TT></html>
 	</template>
 	
 	<template name="sans-serif" match="sans-serif|sans|ss|sf">
