diff --git a/blogthon.cgi b/blogthon.cgi
index 2da17d3..1f19d4f 100755
--- a/blogthon.cgi
+++ b/blogthon.cgi
@@ -55,7 +55,7 @@ def document_header(string):
 	if string == "xhtml-strict":
 		print 'Content-type: text/html\n'
 		print '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"'
-		print ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
+		print ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
 		print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">'
 	if string == "atom":
 		print 'Content-type: application/atom+xml\n'
@@ -454,14 +454,14 @@ else:
 								notfirstline = 0 # Ugly fix for closing comment containers
 
 								for line in comments_content:
-									if line.split(".", 1)[0] == "-":
+									if re.search("^-", line):
 										if notfirstline == 1:
 											print '                </div>'
 											print '            </div>'
 											notfirstline = 0;
 										print '            <div class="comment">'
 										print '                <div class="comment_author">' + line.split(".", 1)[1].strip() + '</div>'
-									elif line.split(".", 1)[0] == "+":
+									elif re.search("^\+", line):
 										print '                <div class="comment_date">' + line.split(".", 1)[1].strip() + '</div>'
 										print '                <div class="comment_content">'
 									else:
