diff --git a/blogthon.cgi b/blogthon.cgi
index 71bf580..dc34572 100755
--- a/blogthon.cgi
+++ b/blogthon.cgi
@@ -30,6 +30,7 @@ monthlist = configuration.get('look', 'monthlist')
 staticpages = configuration.get('look', 'staticpages')
 linklist = configuration.get('look', 'linklist')
 permalinks = configuration.get('look', 'permalinks')
+comments = configuration.get('look', 'comments')
 newest_first = configuration.get('look', 'newest_first')
 
 action = cgi.FieldStorage()
@@ -103,7 +104,7 @@ if linklist == "True":
 	print '            <div class="sidebarentry">'
 	print '                <small>links</small><br />'
 	for line in content:
-		print '                &nbsp;<a href=' + line.split(" ")[0] + '>' + line.split(" ", 1)[1] + '</a>&nbsp;<br />'
+		print '                &nbsp;<a href=' + line.split(" ")[0] + '>' + line.split(" ", 1)[1].strip() + '</a>&nbsp;<br />'
 	print '            </div>'
 	content.close()
 
@@ -138,6 +139,11 @@ else: # Show regular entry
 					print '            <div class="entry"><p>'
 					for line in content:
 						print '                ' + line.strip() + '<br />'
+					if comments == "True":
+						print '                <div class="comment">'
+						print '                    <ul><li><a href=? class="comment">comments</a></li></ul>'
+						print '                </div><br />'
+						
 					print '            </p></div>'
 					print '            <br /><br />'
 					content.close()
diff --git a/configuration b/configuration
index 1373d15..35004fd 100644
--- a/configuration
+++ b/configuration
@@ -12,4 +12,5 @@ staticpages: True
 monthlist: True
 linklist: True
 permalinks: True
+comments: True
 newest_first: True
diff --git a/styles/blogthon.css b/styles/blogthon.css
index ecaaa63..3808f1a 100644
--- a/styles/blogthon.css
+++ b/styles/blogthon.css
@@ -71,3 +71,10 @@ a.entrytitle:link, a.entrytitle:hover, a.entrytitle:visited, a.entrytitle:active
     text-align: center;
     background: #111;
 }
+
+a.comment:link, a.comment:hover, a.comment:active, a.comment:visited {
+	font-family: Arial;
+	font-size: 8px;
+}
+
+# vim: set tw=0 ts=4: