diff --git a/b2commentspopup.php b/b2commentspopup.php
index eafdc48806..85204da73b 100644
--- a/b2commentspopup.php
+++ b/b2commentspopup.php
@@ -23,6 +23,10 @@ foreach ($posts as $post) { start_b2();
 
 <p><a href="<?php echo $siteurl; ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>">RSS feed for comments on this post.</a></p>
 
+<?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 } ?>
+
 <ol id="comments">
 <?php /* this line is b2's motor, do not delete it */ 
 $comments = $wpdb->get_results("SELECT * FROM $tablecomments WHERE comment_post_ID = $id ORDER BY comment_date");
@@ -51,12 +55,12 @@ else {
 <?php 
 	if ('open' == $commentstatus->comment_status) { ?>
 <h2>Leave a Comment</h2>
-<p>Line and paragraph breaks automatic, website trumps email, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <?php echo htmlentities($comment_allowed_tags); ?></p>
+<p>Line and paragraph breaks automatic, website trumps email, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo htmlentities(str_replace('<', ' <', $comment_allowed_tags)); ?></code></p>
 
 <form action="<?php echo $siteurl; ?>/b2comments.post.php" method="post" id="commentform">
 	<p>
 	  <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
-	   <label for="author">name</label>
+	   <label for="author">Name</label>
 	<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
 	<input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars($_SERVER["REQUEST_URI"]); ?>" />
 	</p>
@@ -68,7 +72,7 @@ else {
 
 	<p>
 	  <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
-	   <label for="url"><acronym title="Uniform Resource Locator">URL</acronym></label>
+	   <label for="url"><acronym title="Uniform Resource Identifier">URI</acronym></label>
 	</p>
 
 	<p>