diff --git a/format-master.xml b/format-master.xml
index 5ca1980..63fba8d 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -503,7 +503,7 @@
 	</template>
 	<template name="underline" match="underline|u">
 		<latex>\underline{<xsl:apply-templates />}</latex>
-		<html><U><xsl:apply-templates /></U></html>
+		<html><span style="text-decoration: underline;"><xsl:apply-templates /></span></html>
 	</template>
 	<template name="term" match="term">
 		<latex>\term{<xsl:apply-templates />}</latex>
@@ -1215,7 +1215,10 @@
 		</html>
 	</template>
 	
-	<template name="document-author" match="document/author" />
+	<template name="document-author" match="document/author">
+		<html><p><xsl:apply-templates /></p></html>
+	</template>
+	
 	<template name="document-date" match="document/date" />
 
 	<!--
@@ -2401,11 +2404,18 @@
 	</template>
 	
 	
-	<!-- Sometimes we might need to embed raw code to handle something tricky. -->
+	<!--
+		Sometimes we might need to embed raw code to handle something tricky.
+	-->
 	<template name="raw-latex" match="raw-code[@format = 'latex']|raw-latex">
 		<latex><xsl:apply-templates /></latex>
 	</template>
 		
+	<!--
+		This can be a tricky if the document being processed declares any
+		namespaces, as they generally end up attached to the first element
+		of the raw HTML. I haven't discovered a workaround yet :(.
+	-->
 	<template name="raw-html" match="raw-code[@format = 'html']|raw-html">
 		<html><xsl:copy-of select="*" /></html>
 	</template>
