diff --git a/modules/multi-column.xml b/modules/multi-column.xml
index 6b624cd..a82c7e3 100755
--- a/modules/multi-column.xml
+++ b/modules/multi-column.xml
@@ -15,6 +15,8 @@
 		@align: Overall alignment of the columns (only relevant if the total width of the columns is less than the page width). [LEFT, center, right]
 		
 		@width: Total width of the column set, expressed as a fraction of the usable page width between 0 and 1 (this will be multiplied by 100 for HTML). Individual column widths are then expressed as a fraction of this total width. [default is 1]
+		
+		TODO: The default column width goes awry when the total width is less than 1.0. It works OK if you explicitly specify individual column widths.
 	-->
 	<template name="multi-column" match="multi-column">
 		<common formats="/latex/xelatex/">
@@ -23,12 +25,12 @@
 				<xsl:if test="@width"><xsl:value-of select="@width" /></xsl:if>
 			</xsl:variable>
 			<xsl:choose>
-				<xsl:when test="@vspace = 'small'">\smallskip</xsl:when>
-				<xsl:when test="@vspace = 'medium'">\medskip</xsl:when>
-				<xsl:when test="@vspace = 'big'">\bigskip</xsl:when>
-				<xsl:when test="@vspace">\vskip<xsl:value-of select="@vspace" /></xsl:when>
+				<xsl:when test="@vspace = 'small'"><xsl:text>\smallskip</xsl:text></xsl:when>
+				<xsl:when test="@vspace = 'medium'"><xsl:text>\medskip</xsl:text></xsl:when>
+				<xsl:when test="@vspace = 'big'"><xsl:text>\bigskip</xsl:text></xsl:when>
+				<xsl:when test="@vspace"><xsl:text>\vskip</xsl:text><xsl:value-of select="@vspace" /></xsl:when>
 			</xsl:choose>
-			\noindent
+			<xsl:text>\noindent</xsl:text>
 			<xsl:if test="@align">
 				<xsl:text>\begin{</xsl:text>
 				<xsl:choose>
@@ -59,10 +61,10 @@
 				<xsl:text>}</xsl:text>
 			</xsl:if>
 			<xsl:choose>
-				<xsl:when test="@vspace = 'small'">\smallskip</xsl:when>
-				<xsl:when test="@vspace = 'medium'">\medskip</xsl:when>
-				<xsl:when test="@vspace = 'big'">\bigskip</xsl:when>
-				<xsl:when test="@vspace">\vskip<xsl:value-of select="@vspace" /></xsl:when>
+				<xsl:when test="@vspace = 'small'"><xsl:text>\smallskip</xsl:text></xsl:when>
+				<xsl:when test="@vspace = 'medium'"><xsl:text>\medskip</xsl:text></xsl:when>
+				<xsl:when test="@vspace = 'big'"><xsl:text>\bigskip</xsl:text></xsl:when>
+				<xsl:when test="@vspace"><xsl:text>\vskip</xsl:text><xsl:value-of select="@vspace" /></xsl:when>
 			</xsl:choose>
 		</common>
 		<common formats="/html/xhtml/">
@@ -71,6 +73,8 @@
 				<xsl:if test="@width"><xsl:value-of select="@width * 100" /></xsl:if>
 			</xsl:variable>
 			<xsl:if test="@vspace"><br /></xsl:if>
+			
+			<!-- TODO: change this to use CSS instead of HTML tables. -->
 			<table border="0" width="{$total-width}%">
 				<xsl:if test="@align">
 					<xsl:attribute name="align">