diff --git a/oracle-docs.perl b/oracle-docs.perl
index a16021d..f33404c 100755
--- a/oracle-docs.perl
+++ b/oracle-docs.perl
@@ -20,23 +20,23 @@
 @references =
 (
 	# Name(0)	Code(1)	URL(2)
-	"Documentation										Docs			${oracle_documentation_root}",
-	"Database Administrator<apostrophe/>s Guide			Admin			${oracle_documentation_root}server.111/b28310/toc.htm",
-	"2 Day Developer<apostrophe/>s Guide				AppDev2Day		${oracle_documentation_root}appdev.111/b28843/toc.htm",
-	"Advanced Application Developer<apostrophe/>s Guide	AppDevAdv		${oracle_documentation_root}appdev.111/b28424/toc.htm",
-	"Object-Relational Developer<apostrophe/>s Guide	AppDevOR		${oracle_documentation_root}appdev.111/b28371/toc.htm",
-	"Database Concepts									Concepts		${oracle_documentation_root}server.111/b28318/toc.htm",
-	"Data Warehousing Guide								DataWarehousing	${oracle_documentation_root}server.111/b28313/toc.htm",
-	"Database Error Messages							Errors			${oracle_documentation_root}server.111/b28278/toc.htm",
-	"SQL Reference										SQL				${oracle_documentation_root}server.111/b28286/toc.htm",
-	"Java Developer<apostrophe/>s Guide					Java			${oracle_documentation_root}java.111/b31225/toc.htm",
-	"JDBC Developer<apostrophe/>s Guide and Reference	JDBC			${oracle_documentation_root}java.111/b31224/toc.htm",
-	"Database Master Glossary							Glossary		${oracle_documentation_root}mix.111/b14388/toc.htm",
-	"Performance Tuning Guide							Tuning			${oracle_documentation_root}server.111/b28274/toc.htm",
-	"PL/SQL Language Reference							PLSQL			${oracle_documentation_root}appdev.111/b28370/toc.htm",
-	"PL/SQL Packages and Types Reference				PLSQLPkgTyp		${oracle_documentation_root}appdev.111/b28419/toc.htm",
-	"Database Master Index								Index			${oracle_documentation_root}mix.111/b14387/toc.htm",
-	"Database Reference									Reference		${oracle_documentation_root}server.111/b28320/toc.htm"
+	"Documentation											Docs			${oracle_documentation_root}",
+	"Database Administrator<apostrophe />s Guide			Admin			${oracle_documentation_root}server.111/b28310/toc.htm",
+	"2 Day Developer<apostrophe />s Guide					AppDev2Day		${oracle_documentation_root}appdev.111/b28843/toc.htm",
+	"Advanced Application Developer<apostrophe />s Guide	AppDevAdv		${oracle_documentation_root}appdev.111/b28424/toc.htm",
+	"Object-Relational Developer<apostrophe />s Guide		AppDevOR		${oracle_documentation_root}appdev.111/b28371/toc.htm",
+	"Database Concepts										Concepts		${oracle_documentation_root}server.111/b28318/toc.htm",
+	"Data Warehousing Guide									DataWarehousing	${oracle_documentation_root}server.111/b28313/toc.htm",
+	"Database Error Messages								Errors			${oracle_documentation_root}server.111/b28278/toc.htm",
+	"SQL Reference											SQL				${oracle_documentation_root}server.111/b28286/toc.htm",
+	"Java Developer<apostrophe />s Guide					Java			${oracle_documentation_root}java.111/b31225/toc.htm",
+	"JDBC Developer<apostrophe />s Guide and Reference		JDBC			${oracle_documentation_root}java.111/b31224/toc.htm",
+	"Database Master Glossary								Glossary		${oracle_documentation_root}mix.111/b14388/toc.htm",
+	"Performance Tuning Guide								Tuning			${oracle_documentation_root}server.111/b28274/toc.htm",
+	"PL/SQL Language Reference								PLSQL			${oracle_documentation_root}appdev.111/b28370/toc.htm",
+	"PL/SQL Packages and Types Reference					PLSQLPkgTyp		${oracle_documentation_root}appdev.111/b28419/toc.htm",
+	"Database Master Index									Index			${oracle_documentation_root}mix.111/b14387/toc.htm",
+	"Database Reference										Reference		${oracle_documentation_root}server.111/b28320/toc.htm"
 );
 
 # Prefix to use in the generated template names:
@@ -52,15 +52,27 @@
 $output_type = $ARGV[1];
 
 if ($output_type eq "xslt") {
-	print "<?xml version=\"1.0\"?>\n" . 
-		"<!-- Do not edit!  Automatically generated by oracle-docs.perl! -->\n" . 
-		"<stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\">\n";
+	print <<END_OF_HEADER
+<?xml version="1.0"?>
+<!-- Do not edit!  Automatically generated by oracle-docs.perl! -->
+<stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+END_OF_HEADER
+;
 }
 
 # One-off hard-coded template for a link to the root of the documentation set, using the URL as the anchor text.
 # This is used in several places in the INFO 212 course book and updating them is more of a pain than implementing this!
 if ($output_type eq "xslt") {
-	print "<xsl:template name=\"OraDocsURL\" match=\"OraDocsURL\"><xsl:call-template name=\"empty-hyperlink-url-internal\"><xsl:with-param name=\"url\">" . $oracle_documentation_root . "</xsl:with-param></xsl:call-template></xsl:template>\n";
+	print <<END_OF_TEMPLATE
+	<xsl:template name="OraDocsURL" match="OraDocsURL">
+		<xsl:call-template name="empty-hyperlink-url-internal">
+			<xsl:with-param name="url">${oracle_documentation_root}</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+
+END_OF_TEMPLATE
+;
 #	print "<xsl:template name=\"OraDocsURL\" match=\"OraDocsURL\"><xsl:apply-templates><xsl:element name=\"hyperlink\"><xsl:attribute name=\"url\">" . $oracle_documentation_root . "</xsl:attribute></xsl:element></xsl:apply-templates></xsl:template>\n";
 }
 	
@@ -113,17 +125,21 @@
 # Generate an XSLT meta-template for generating either an HTML or a LaTeX producing template.
 # Arguments: (<descriptive-label>, <entry-code>, <url>)
 sub generate_xsl_metatemplate {
-	return "<xsl:template name=\"" . $oracle_prefix . $_[1] . "\" match=\"" . $oracle_prefix . $_[1] . "\">" . 
-		"<xsl:call-template name=\"hyperlink-internal\">" . # mode=\"hyperlink-internal\">" .
-		"<xsl:with-param name=\"url\">" . $_[2] . "</xsl:with-param>" .
-		"<xsl:with-param name=\"label\">" . "<xsl:call-template name=\"OracleServer\"/>" . " " . $_[0] . "</xsl:with-param>" .
-		"</xsl:call-template>" .
-		"</xsl:template>";
-	
+	return <<END_OF_TEMPLATE
+	<xsl:template name="${oracle_prefix}${_[1]}" match="${oracle_prefix}${_[1]}">
+		<xsl:call-template name="hyperlink-internal">
+			<xsl:with-param name="url">${_[2]}</xsl:with-param>
+			<xsl:with-param name="label">
+				<xsl:call-template name="OracleServer" /> ${_[0]}
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+END_OF_TEMPLATE
+;
 	# Nope, wrong tree here:
 	return "<xsl:template name=\"" . $oracle_prefix . $_[1] . "\" match=\"" . $oracle_prefix . $_[1] . "\">" . 
-		"<latex>" . "\\href{" . $_[2] . "}" . "{" . "<xsl:call-template name=\"OracleServer\"/>" . " " . $_[0] . "}" . "</latex>" . 
-		"<html>" . "<a href=\"" . $_[2]. "\">" . "<xsl:call-template name=\"OracleServer\"/>" . " " . $_[0] . "</a>" . "</html>" . 
+		"<latex>" . "\\href{" . $_[2] . "}" . "{" . "<xsl:call-template name=\"OracleServer\" />" . " " . $_[0] . "}" . "</latex>" . 
+		"<html>" . "<a href=\"" . $_[2]. "\">" . "<xsl:call-template name=\"OracleServer\" />" . " " . $_[0] . "</a>" . "</html>" . 
 		"</xsl:template>";
 }
 
@@ -131,7 +147,7 @@
 # Produce the actual XML markup to be used in authoring (just to provide a handy list of them all):
 # Arguments: (<entry-code>)
 sub generate_xml {
-	return "<" . $oracle_prefix . $_[0]. "/>";
+	return "<" . $oracle_prefix . $_[0]. " />";
 }
 
 # Produce XML markup for a link to a section of the documentation (deprecated):
@@ -141,11 +157,11 @@
 
 # Generate an XSLT template for HTML output (deprecated):
 sub generate_xsl_template_for_html {
-		return "<xsl:template match=\"" . $_[0] . "\"><A><xsl:attribute name=\"HREF\">" . $_[1] . "</xsl:attribute>" . "<xsl:call-template name=\"OracleServer\"/> " . $_[2] . "</A></xsl:template>";
+		return "<xsl:template match=\"" . $_[0] . "\"><A><xsl:attribute name=\"HREF\">" . $_[1] . "</xsl:attribute>" . "<xsl:call-template name=\"OracleServer\" /> " . $_[2] . "</A></xsl:template>";
 }
 
 # Generate an XSLT template for LaTeX output (deprecated):
 sub generate_xsl_template_for_latex {
-	return "<xsl:template match=\"" . $_[0] . "\">\\href{" . $_[1] . "}{<xsl:call-template name=\"OracleServer\"/> " . $_[2] . "}</xsl:template>";
+	return "<xsl:template match=\"" . $_[0] . "\">\\href{" . $_[1] . "}{<xsl:call-template name=\"OracleServer\" /> " . $_[2] . "}</xsl:template>";
 }