diff --git a/build.properties.dev b/build.properties.dev
index 46e6373ad..a823ffb20 100644
--- a/build.properties.dev
+++ b/build.properties.dev
@@ -1,11 +1,6 @@
 name=Doctrine
-summary=PHP5 Database ORM
-description=Doctrine is an ORM (object relational mapper) for PHP 5.2.x+ that sits on top of
-a powerful DBAL (database abstraction layer). One of its key features is the
-ability to optionally write database queries in an OO (object oriented)
-SQL-dialect called DQL inspired by Hibernates HQL. This provides developers with
-a powerful alternative to SQL that maintains a maximum of flexibility without
-requiring needless code duplication.
+summary=PHP5 ORM
+description=Doctrine 2 is an ORM (object relational mapper) for transparent PHP object persistence.
 version_name=2.0.0-ALPHA1
 version=2.0.0
 stability=alpha
diff --git a/lib/Doctrine/Common/ClassLoader.php b/lib/Doctrine/Common/ClassLoader.php
index 5db195976..a48e34503 100644
--- a/lib/Doctrine/Common/ClassLoader.php
+++ b/lib/Doctrine/Common/ClassLoader.php
@@ -49,7 +49,7 @@ class ClassLoader
     /**
      * @var string Namespace separator
      */
-    private $_namespaceSeparator = '\\';
+    private $_namespaceSeparator = array('\\', '_');
     
     /**
      * @var string File extension used for classes
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
index b5f70eeaf..982e82775 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
+++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
@@ -19,8 +19,8 @@ use Doctrine\ORM\Tools\SchemaTool,
  * otherwise it has no effect.
  * 
  * <tt>--dump-sql</tt>
- * Specifies that instead of directly executing the SQL statements for creating the
- * database schema, they should be printed to the standard output.
+ * Specifies that instead of directly executing the SQL statements,
+ * they should be printed to the standard output.
  * 
  * <tt>--create</tt>
  * Specifies that the schema of the classes should be created.
diff --git a/tools/sandbox/index.php b/tools/sandbox/index.php
index eb7bbe89f..3ffbe8677 100644
--- a/tools/sandbox/index.php
+++ b/tools/sandbox/index.php
@@ -1,3 +1,5 @@
 <?php
 
-require 'config.php';
\ No newline at end of file
+require 'config.php';
+
+// Place your code here. $em is at your service.
\ No newline at end of file