diff --git a/content.php b/content.php
index 7dcfc89..05ac295 100644
--- a/content.php
+++ b/content.php
@@ -4,9 +4,15 @@
 ?>
 
 <div class="blog-post">
-	<h2 class="blog-post-title"><?php the_title(); ?></h2>
-	<p class="blog-post-meta"><?php the_date(); ?> by <a href="#"><?php the_author(); ?></a></p>
+	<h2 class="blog-post-title"><a href="<?php the_permalink(); ?> "><?php the_title(); ?></a></h2>
+	<p class="blog-post-meta"><?php the_date(); ?> by <?php the_author_link(); ?></p>
 
  <?php the_content(); ?>
 
 </div><!-- /.blog-post -->
+<?php
+// If comments are open or we have at least one comment, load up the comment template.
+ if ( comments_open() || get_comments_number() ) :
+     comments_template();
+ endif;
+?>