diff --git a/classes/ComicPressDBInterface.inc b/classes/ComicPressDBInterface.inc
index 0e42de9..25e088e 100644
--- a/classes/ComicPressDBInterface.inc
+++ b/classes/ComicPressDBInterface.inc
@@ -30,13 +30,16 @@ class ComicPressDBInterface {
    * Find the terminal post in a specific category.
    */
   function get_terminal_post_in_category($category_id, $first = true) {
+    $temp = $wp_query; $wp_query = null;
     $sort_order = $first ? "asc" : "desc";
     $terminal_comic_query = new WP_Query();
     $terminal_comic_query->query("showposts=1&order=${sort_order}&cat=${category_id}&status=publish");
+    $post = false;
     if ($terminal_comic_query->have_posts()) {
-      return reset($terminal_comic_query->posts);
+      $post = reset($terminal_comic_query->posts);
     }
-    return false;
+    $wp_query = null; $wp_query = $temp;
+    return $post;
   }
   
   /**
diff --git a/classes/ComicPressStoryline.inc b/classes/ComicPressStoryline.inc
index 4acc4db..0b9273a 100644
--- a/classes/ComicPressStoryline.inc
+++ b/classes/ComicPressStoryline.inc
@@ -18,6 +18,10 @@ class ComicPressStoryline {
 
     $adjacents_by_parent = array();
 
+    if (is_string($structure)) {
+      $structure = explode(',', $structure);
+    }
+
     if (is_array($structure)) {
       $is_valid = true;
       foreach ($structure as $branch) {
@@ -114,6 +118,10 @@ class ComicPressStoryline {
     }
     return $result;
   }
+
+	function get_comic_categories() {
+		return array_keys($this->_structure);
+	}
 }
 
 ?>
\ No newline at end of file