diff --git a/trunk/images/tango/go-next.png b/trunk/images/tango/go-next.png
new file mode 100644
index 0000000..a68e2db
Binary files /dev/null and b/trunk/images/tango/go-next.png differ
diff --git a/trunk/locale/en-US.xml b/trunk/locale/en-US.xml
index 889c268..808d000 100755
--- a/trunk/locale/en-US.xml
+++ b/trunk/locale/en-US.xml
@@ -37,7 +37,7 @@
 	<str id="error_missing_file">You did not supply a file.</str>
 	<str id="error_missing_DC.Title">You did not supply a title.</str>
 	<str id="error_missing_DC.Creator">You did not supply a creator.</str>
-	<str id="error_missing_DC.Subject">You did not supply a subject.</str>
+	<str id="error_missing_DC.Subject">You did not supply any keywords.</str>
 	<str id="error_missing_DC.Description">You did not supply a description.</str>
 	<str id="error_missing_DC.Publisher">You did not supply a publisher.</str>
 	<str id="error_missing_DC.Title">You did not supply a title.</str>
@@ -74,18 +74,20 @@
 	<str id="instruction_file">Specify the file you want to upload.</str>
 	<str id="instruction_title">State the title of the video.</str>
 	<str id="instruction_creator">Specify the creator of the video.</str>
-	<str id="instruction_subject">State the overall subject of the video.</str>
+	<str id="instruction_subject">State some keywords, separated by commas.</str>
 	<str id="instruction_description">Describe the video in natural language.</str>
 	<str id="instruction_source">Specify the source, preferably by URL.</str>
 	<str id="instruction_language">State the language of the video.</str>
 	<str id="instruction_coverage">Specify the time and location covered.</str>
-	<str id="this_is_page_1">(This is page 1 of 3.)</str>
-	<str id="this_is_page_2">(This is page 2 of 3.)</str>
-	<str id="this_is_page_2">(This is page 3 of 3.)</str>
+	<str id="this_is_page_1">This is page 1 of 3.</str>
+	<str id="this_is_page_2">This is page 2 of 3.</str>
+	<str id="this_is_page_2">This is page 3 of 3.</str>
 
 	<!-- video page -->
 	<str id="download_video">download video</str>
 	<str id="license_conditions">license conditions</str>
+	<str id="comment_on_video">Flamewar area below. Proceed with Caution.</str>
+	<str id="comment_post">post comment</str>
 
 	<!-- dublin core entities -->
 	<str id="DC.Title">title</str>
diff --git a/trunk/style/gnutube.css b/trunk/style/gnutube.css
index 7c3ae79..d22d3ec 100755
--- a/trunk/style/gnutube.css
+++ b/trunk/style/gnutube.css
@@ -198,6 +198,30 @@ div
 			width:			50%;
 		}
 
+	div.comments
+	{
+		line-height:	2.5em;
+		margin:			1.5em;
+		text-align:		center;
+	}
+
+	div.comments div.comment
+		{
+			margin:			0.75em;
+			line-height:	1.5em;
+		}
+
+	div.commentform
+	{
+		text-align:		center;
+	}
+
+		div.commentform form
+		{
+			line-height:	2.5em;
+			text-align:		center;
+		}
+
 	div.toplists
 	{
 		text-align:		center;
@@ -226,4 +250,14 @@ hr
 span.protip
 {
 	color:				#606060;
+}
+
+span.protip:after
+{
+	content:			" )";
+}
+
+span.protip:before
+{
+	content:			"( ";
 }
\ No newline at end of file
diff --git a/trunk/video-test.xml b/trunk/video-test.xml
index 883138e..fa1105b 100644
--- a/trunk/video-test.xml
+++ b/trunk/video-test.xml
@@ -9,7 +9,6 @@
 	xmlns:cc="http://web.resource.org/cc/"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 >
-	<message type="information" text="information_logged_in" />
 	<video>
 		<rdf:RDF>
 			<cc:Work rdf:about="./videos/zwobot-01-test.ogg">
@@ -43,4 +42,9 @@
 			</cc:License>
 		</rdf:RDF>
 	</video>
+	<comments>
+		<comment username="longcat">gnol si tacgnol.</comment>
+		<comment username="tallpet">tallpet is tall, tall, tall.</comment>
+		<comment username="long">LUNGCAT !!! ITZ LUNGER !!1</comment>
+	</comments>
 </page>
\ No newline at end of file
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index 19a0158..f3c2c75 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -410,7 +410,7 @@
 -->
 			</xsl:for-each>
 			<xsl:for-each select="rdf:RDF/cc:License/cc:prohibits">		
-				<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/CommercialUse'">
+				<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/			CommercialUse'">
 					<img src="./images/cc/cc-noncommercial.png" />
 				</xsl:if>
 				<xsl:if test="@rdf:resource = 'http://web.resource.org/cc/DerivativeWorks'">
@@ -487,7 +487,7 @@
 		</tr>
 	</table>
 	
-	<table class="videometadata">
+	<table class="referer">
 		<xsl:for-each select="/page/referers/referer">
 			<tr>
 				<td class="leftcell">
@@ -499,31 +499,46 @@
 			</tr>
 		</xsl:for-each>
 	</table>
-	
-	<table class="videometadata">
-		<xsl:for-each select="/page/comments/comment">
-			<tr>
-				<td class="leftcell">
-					<xsl:value-of select="@user" />
-				</td>
-				<td class="rightcell">
-					<xsl:value-of select="@text" />
-				</td>
-			</tr>
-		</xsl:for-each>
-	</table>
 
-	<div class="">
+</xsl:template>
+
+<xsl:template match="comments">
+
+	<div class="comments">
+		<span class="protip">
+			<xsl:value-of select="$locale_strings/str[@id='comment_on_video']" />
+		</span>
+		<br />
+		<xsl:for-each select="comment">
+			<div class="comment">
+				<a>
+					<xsl:attribute name="href">
+						./user/<xsl:value-of select="@username" />
+					</xsl:attribute>
+					<xsl:value-of select="@username" />
+				</a>:
+				<br />
+				<xsl:value-of select="." />
+			</div>
+		</xsl:for-each>
+	</div>
+
+	<div class="commentform">
 		<form method="post">
 			<xsl:attribute name="action">
-				<xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" />
+<!--
+			a bit of action, please
+-->
 			</xsl:attribute>
 			<fieldset>
-				<xsl:value-of select="$locale_strings/str[@id='DC.Date']" />
 				<br />
-				<textarea name="comment" cols="50" rows="5"></textarea>
+				<textarea name="comment" cols="30" rows="3" />
 				<br />
-				<input type="submit" name="send" />
+				<input type="submit" name="send">
+					<xsl:attribute name="value">
+						<xsl:value-of select="$locale_strings/str[@id='comment_post']" />
+					</xsl:attribute>
+				</input>
 			</fieldset>
 		</form>
 	</div>