diff --git a/b2-include/b2template.functions.php b/b2-include/b2template.functions.php
index 71446b8692..846c42fed1 100644
--- a/b2-include/b2template.functions.php
+++ b/b2-include/b2template.functions.php
@@ -1175,6 +1175,18 @@ function posts_nav_link($sep=' :: ', $prelabel='<< Previous Page', $nxtlabel='Ne
 
 /***** Category tags *****/
 
+function get_category_link($echo = false, $file='') {
+	global $post, $querystring_start, $querystring_equal, $siteurl, $blogfilename;
+	$cat_ID = $post->post_category;
+    if ($file == '') {
+        $file = "$siteurl/$blogfilename";
+    }
+    $link = $file.$querystring_start.'cat'.$querystring_equal.$cat_ID;
+    if ($echo)
+        echo($link);
+    return $link;
+}
+
 function the_category() {
 	$category = get_the_category();
 	$category = apply_filters('the_category', $category);
@@ -1280,10 +1292,10 @@ function dropdown_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_
 function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc',
                    $file = 'blah', $list = true, $optiondates = 0, $optioncount = 0, $hide_empty = 1) {
 	global $tablecategories, $tableposts, $querycount, $wpdb;
-	global $pagenow;
+	global $pagenow, $siteurl, $blogfilename;
 	global $querystring_start, $querystring_equal, $querystring_separator;
     if (($file == 'blah') || ($file == '')) {
-        $file = $pagenow;
+        $file = "$siteurl/$blogfilename";
     }
 	$sort_column = 'cat_'.$sort_column;
 
@@ -1396,7 +1408,7 @@ function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Com
                 return;
             }
         }
-        echo '<a href="';
+        echo '<a href="' . $siteurl . '/';
         if ($b2commentsjavascript) {
             echo get_permalink();
             echo '" onclick="b2open(this.href); return false"';
diff --git a/index.php b/index.php
index 215f2d36f6..9f875aeaa8 100644
--- a/index.php
+++ b/index.php
@@ -22,7 +22,7 @@ require_once($abspath.'wp-links/links.php');
 	<link rel="alternate" type="text/xml" title="RSS" href="<?php bloginfo('rss2_url'); ?>" />
 	<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
     <?php get_archives('monthly', '', 'link'); ?>
-	<?php // comments_popup_script(); // off by default ?>
+	<?php comments_popup_script(); // off by default ?>
 
 </head>
 
@@ -35,8 +35,8 @@ require_once($abspath.'wp-links/links.php');
 <?php the_date('','<h2>','</h2>'); ?>
 
  <h3 class="storytitle" id="post-<?php the_ID(); ?>">
-  <a href="<?php permalink_link() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a>
-  <span class="meta"><a href="?cat=<?php the_category_ID() ?>" title="Category: <?php the_category() ?>">[<?php the_category() ?>]</a> &#8212; <?php the_author() ?> @ <?php the_time() ?></span>
+  <a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a>
+  <span class="meta"><a href="<?php get_category_link(1) ?>" title="Category: <?php the_category() ?>">[<?php the_category() ?>]</a> &#8212; <?php the_author() ?> @ <?php the_time() ?></span>
  </h3>
 
 <div class="storycontent">
@@ -93,16 +93,16 @@ require_once($abspath.'wp-links/links.php');
  </li>
  <li>Other:
 	<ul>
-		<li><a href="b2login.php">login</a></li>
-		<li><a href="b2register.php">register</a></li>
+		<li><a href="<?php echo $siteurl; ?>/b2login.php">login</a></li>
+		<li><a href="<?php echo $siteurl; ?>/b2register.php">register</a></li>
 	</ul>
  </li>
  <li>Meta:
  	<ul>
-		<li><a href="b2rss.php">RSS .92</a></li>
-		<li><a href="b2rdf.php">RDF 1.0</a></li>
-		<li><a href="b2rss2.php">RSS 2.0</a></li>
-		<li><a href="wp-commentsrss2.php">Comments RSS 2.0</a></li>
+		<li><a href="<?php echo $siteurl; ?>/b2rss.php">RSS .92</a></li>
+		<li><a href="<?php echo $siteurl; ?>/b2rdf.php">RDF 1.0</a></li>
+		<li><a href="<?php echo $siteurl; ?>/b2rss2.php">RSS 2.0</a></li>
+		<li><a href="<?php echo $siteurl; ?>/wp-commentsrss2.php">Comments RSS 2.0</a></li>
 		<li><a href="http://validator.w3.org/check/referer" title="This page validates as XHTML 1.0 Transitional">Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr></a></li>
 		<li><a href="http://wordpress.org" title="Powered by WordPress, personal publishing platform">WP</a></li>
 	</ul>