diff --git a/ApplicationServer/ApplicationServerSchedulerImpl.cpp b/ApplicationServer/ApplicationServerSchedulerImpl.cpp
index 3629faf610..6f49d2772e 100644
--- a/ApplicationServer/ApplicationServerSchedulerImpl.cpp
+++ b/ApplicationServer/ApplicationServerSchedulerImpl.cpp
@@ -124,7 +124,7 @@ namespace triagens {
       : ApplicationServerImpl(description, version),
         _reportIntervall(60.0),
         _multiSchedulerAllowed(false),
-        _nrSchedulerThreads(1),
+        _nrSchedulerThreads(4),
         _backend(0),
         reuseAddress(true),
         descriptorMinimum(0),
diff --git a/README.md b/README.md
index 562846f44c..b0e9575f1b 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Key features include:
 
 For more in-depth information
 
-* read more on the [design goals of ArangoDB](http://www.arangodb.org/2012/03/07/arangodbs-design-objectives)
+* read more on the [design goals of ArangoDB](http://www.arangodb.org/2012/03/07/avocadodbs-design-objectives)
 * [watch the video](http://vimeo.com/36411892) - Martin Schoenert, architect of ArangoDB, gives an introduction of what the ArangoDB project is about.
 * or  give it a try.
 
diff --git a/html/admin/js/master.js b/html/admin/js/master.js
index 6844a3b9f4..5106041946 100644
--- a/html/admin/js/master.js
+++ b/html/admin/js/master.js
@@ -789,7 +789,7 @@ var logTable = $('#logTableID').dataTable({
 
         $.ajax({
           type: "PUT",
-          url: "/document/" + collectionID,
+          url: "/_api/document/" + collectionID,
           data: JSON.stringify(parsedContent), 
           contentType: "application/json",
           processData: false, 
@@ -889,7 +889,7 @@ var logTable = $('#logTableID').dataTable({
 
         $.ajax({
           type: "POST",
-          url: "/document?collection=" + collID, 
+          url: "/_api/document?collection=" + collID, 
           data: JSON.stringify(jsonContent), 
           contentType: "application/json",
           processData: false, 
diff --git a/js/actions/system/api-system.js b/js/actions/system/api-system.js
index 26d2e084c2..6ce7123144 100644
--- a/js/actions/system/api-system.js
+++ b/js/actions/system/api-system.js
@@ -26,6 +26,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 var actions = require("actions");
+var internal = require("internal");
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                            administration actions
@@ -36,6 +37,21 @@ var actions = require("actions");
 /// @{
 ////////////////////////////////////////////////////////////////////////////////
 
+////////////////////////////////////////////////////////////////////////////////
+/// @brief returns system time
+////////////////////////////////////////////////////////////////////////////////
+
+function GET_time (req, res) {
+  actions.resultOk(req, res, actions.HTTP_OK, { time : internal.time() });
+}
+
+actions.defineHttp({
+  url : "_api/time",
+  context : "api",
+  prefix : false,
+  callback : GET_time
+});
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief returns system status information for the server
 ////////////////////////////////////////////////////////////////////////////////
@@ -113,7 +129,7 @@ actions.defineHttp({
       result = {};
       result.system = SYS_PROCESS_STAT();
 
-      actions.resultOk(req, res, 200, result);
+      actions.resultOk(req, res, actions.HTTP_OK, result);
     }
     catch (err) {
       actions.resultError(req, res, err);
@@ -189,7 +205,7 @@ actions.defineHttp({
         }
       };
 
-      actions.resultOk(req, res, 200, result);
+      actions.resultOk(req, res, actions.HTTP_OK, result);
     }
     catch (err) {
       actions.resultError(req, res, err);
@@ -246,7 +262,7 @@ actions.defineHttp({
         }
       };
 
-      actions.resultOk(req, res, 200, result);
+      actions.resultOk(req, res, actions.HTTP_OK, result);
     }
     catch (err) {
       actions.resultError(req, res, err);