diff --git a/TODO b/TODO
index c55ceaa1..e2c9e263 100644
--- a/TODO
+++ b/TODO
@@ -14,9 +14,19 @@ afraid to cast your vote for the next feature to be implemented!
 IMPORTANT
  - Get everything into configuration objects (filters, I'm looking at you)
  - Factor demo.php into a set of Printer classes, and then create a stub
-   file for users here
+   file for users here (inside the actual HTML Purifier library)
  - Test HTMLPurifier.auto.php, HTMLPurifier.includes.php, and combinations
    of the two.
+ - Document new ConfigSchema setup and format; dev-includes.txt is a base
+   but we need it in HTML
+ - Document new methods of including the library
+ - We should do a release candidate, because of the major changes
+ - Move utility classes for ConfigSchema into HTML Purifier itself: they're
+   that important
+ - Factor generate-schema-cache.php into a class, so that the maintenance script
+   is as small as possible
+ - Document which scripts need to be called when a change is made
+ - Semi-automated smoketests using PHPT style files
 
 3.1 release [Error'ed]
  # Error logging for filtering/cleanup procedures
diff --git a/maintenance/merge-library.php b/maintenance/merge-library.php
index cf5ad1aa..8e88be41 100755
--- a/maintenance/merge-library.php
+++ b/maintenance/merge-library.php
@@ -131,7 +131,8 @@ create_blank('HTMLPurifier.php');
 echo 'Creating full file...';
 $contents = replace_includes(file_get_contents('HTMLPurifier.includes.php'));
 $contents = str_replace(
-    "define('HTMLPURIFIER_PREFIX', dirname(__FILE__));",
+    // Note that bootstrap is now inside the standalone file
+    "define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__) . '/..'));",
     "define('HTMLPURIFIER_PREFIX', dirname(__FILE__) . '/standalone');
 set_include_path(HTMLPURIFIER_PREFIX . PATH_SEPARATOR . get_include_path());",
     $contents
diff --git a/tests/multitest.php b/tests/multitest.php
index 39cd050a..f9319bf6 100644
--- a/tests/multitest.php
+++ b/tests/multitest.php
@@ -43,7 +43,11 @@ $aliases = array(
 );
 htmlpurifier_parse_args($AC, $aliases);
 
+// Calls generate-includes.php automatically
 shell_exec("php ../maintenance/merge-library.php");
+
+// Not strictly necessary, but its a good idea
+shell_exec("php ../maintenance/generate-schema-cache.php");
 shell_exec('php ../maintenance/flush-definition-cache.php');
 
 $test = new TestSuite('HTML Purifier Multiple Versions Test');