diff --git a/wp-comments.php b/wp-comments.php
index e7e4cc0a67..7e5ae17969 100644
--- a/wp-comments.php
+++ b/wp-comments.php
@@ -19,10 +19,11 @@
 
 <!-- You can start editing here. -->
 
-<h2 id="comments">Comments</h2>
-
-<p><?php comments_rss_link('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.'); ?></p>
-
+<h2 id="comments"><?php comments_number('Comments'); ?> 
+<?php if ('open' == $post->comment_status) { ?>
+<a href="#postcomment" title="Leave a comment">&raquo;</a>
+<?php } ?>
+</h2>
 <?php if ('open' == $post->ping_status) { ?>
 <p>The <acronym title="Uniform Resource Identifier">URI</acronym> to TrackBack this entry is: <em><?php trackback_url() ?></em></p>
 <?php } ?>
@@ -41,8 +42,8 @@
 <?php } else { // this is displayed if there are no comments so far ?>
 	<p>No comments yet.</p>
 <?php } ?>
-
-<h2>Leave a Comment</h2>
+<p><?php comments_rss_link('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.'); ?></p>
+<h2 id="postcomment">Leave a Comment</h2>
 <?php if ('open' == $post->comment_status) { ?>
 <p>Line and paragraph breaks automatic, website trumps email, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo allowed_tags(); ?></code></p>
 
@@ -85,7 +86,7 @@ if ('none' != get_settings("comment_moderation")) {
 	</p>
 </form>
 <?php } else { // comments are closed ?>
-<p>Sorry, comments are closed at this time.</p>
+<p>Sorry, the comment form is closed at this time.</p>
 <?php } ?>
 
 <?php // if you delete this the sky will fall on your head
diff --git a/wp-includes/template-functions-comment.php b/wp-includes/template-functions-comment.php
index 1ca36ab09e..064b6d830f 100644
--- a/wp-includes/template-functions-comment.php
+++ b/wp-includes/template-functions-comment.php
@@ -32,7 +32,8 @@ function comments_popup_script($width=400, $height=400, $file='wp-comments-popup
 function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Comments', $CSSclass='', $none='Comments Off') {
     global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post, $wpdb, $tablecomments, $HTTP_COOKIE_VARS, $cookiehash;
     global $querystring_start, $querystring_equal, $querystring_separator, $siteurl;
-    global $comment_count_cache;
+    global $comment_count_cache, $single;
+	if (!$single) {
     if ('' == $comment_count_cache["$id"]) {
         $number = $wpdb->get_var("SELECT COUNT(comment_ID) FROM $tablecomments WHERE comment_post_ID = $id AND comment_approved = '1';");
     } else {
@@ -65,6 +66,7 @@ function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Com
         comments_number($zero, $one, $more, $number);
         echo '</a>';
     }
+	}
 }
 
 function comment_ID() {
diff --git a/wp-layout.css b/wp-layout.css
index b1f3acb6f7..aeacbba104 100644
--- a/wp-layout.css
+++ b/wp-layout.css
@@ -54,7 +54,7 @@ cite {
 
 h2 {
 	border-bottom: 1px dotted #ccc;
-	font: 80% "Times New Roman", Times, serif;
+	font: 95% "Times New Roman", Times, serif;
 	letter-spacing: 0.2em;
 	margin: 15px 0 2px 0;
 	padding-bottom: 2px;