diff --git a/wp-admin/b2edit.php b/wp-admin/b2edit.php
index b20eb8e0e..8996f5417 100644
--- a/wp-admin/b2edit.php
+++ b/wp-admin/b2edit.php
@@ -19,7 +19,25 @@ if (!get_magic_quotes_gpc()) {
     $HTTP_COOKIE_VARS = add_magic_quotes($HTTP_COOKIE_VARS);
 }
 
-$b2varstoreset = array('action','safe_mode','withcomments','c','posts','poststart','postend','content','edited_post_title','comment_error','profile', 'trackback_url', 'excerpt');
+$b2varstoreset = array('action'
+                      ,'safe_mode'
+                      ,'withcomments'
+                      ,'c'
+                      ,'posts'
+                      ,'poststart'
+                      ,'postend'
+                      ,'content'
+                      ,'edited_post_title'
+                      ,'comment_error'
+                      ,'profile'
+                      ,'trackback_url'
+                      ,'excerpt'
+                      ,'showcomments'
+                      ,'commentstart'
+                      ,'commentend'
+                      ,'commentorder'
+                      );
+
 for ($i=0; $i<count($b2varstoreset); $i += 1) {
     $b2var = $b2varstoreset[$i];
     if (!isset($$b2var)) {
@@ -169,7 +187,7 @@ switch($action) {
 			$ping_status = $postdata['ping_status'];
 			$post_password = $postdata['post_password'];
 
-            include('b2edit.form.php');
+            include('wp-edit.form.php');
         } else {
 ?>
             <p>Since you&#8217;re a newcomer, you&#8217;ll have to wait for an admin to raise your level to 1,
@@ -332,7 +350,7 @@ switch($action) {
         $content = $commentdata['comment_content'];
         $content = format_to_edit($content);
 
-        include('b2edit.form.php');
+        include('wp-edit.form.php');
 
         break;
 
@@ -436,7 +454,7 @@ switch($action) {
                 $ping_status = get_settings('default_ping_status');
                 $post_pingback = get_settings('default_pingback_flag');
                 $default_post_cat = get_settings('default_post_category');
-                include('b2edit.form.php');
+                include('wp-edit.form.php');
                 echo '<br /><br />';
             }
 
@@ -453,7 +471,10 @@ switch($action) {
 
         }
 
-        include('b2edit.showposts.php');
+        include('wp-edit.showposts.php');
+        echo '<br /><br />';
+        include('wp-edit.showcomments.php');
+
         break;
 } // end switch
 /* </Edit> */