diff --git a/Documentation/Examples/graph-graph-get-edge b/Documentation/Examples/graph-graph-get-edge
new file mode 100644
index 0000000000..73127737d5
--- /dev/null
+++ b/Documentation/Examples/graph-graph-get-edge
@@ -0,0 +1,2 @@
+arango> e = g.getEdge("1");
+Edge(1)
diff --git a/arangod/Documentation/api-blueprints.dox b/arangod/Documentation/api-blueprints.dox
index e330ba30c5..a1cf977e5c 100644
--- a/arangod/Documentation/api-blueprints.dox
+++ b/arangod/Documentation/api-blueprints.dox
@@ -43,7 +43,6 @@
 ///
 ///
 ///
-///
 /// @anchor A_JSF_POST_blueprints_vertex
 /// @copydetails JSF_POST_blueprints_vertex
 ///
@@ -59,8 +58,8 @@
 ///
 ///
 ///
-/// @anchor A_JSF_GET_blueprints_vertices
-/// @copydetails JSF_GET_blueprints_vertices
+/// @anchor A_JSF_POST_blueprints_vertices
+/// @copydetails JSF_POST_blueprints_vertices
 ///
 ///
 ///
@@ -80,8 +79,8 @@
 ///
 ///
 ///
-/// @anchor A_JSF_GET_blueprints_edges
-/// @copydetails JSF_GET_blueprints_edges
+/// @anchor A_JSF_POST_blueprints_edges
+/// @copydetails JSF_POST_blueprints_edges
 ///
 //////////////////////////////////////////////////////
 
diff --git a/arangod/Documentation/implementor-manual.dox b/arangod/Documentation/implementor-manual.dox
index a3f0a788d4..7670ca6718 100644
--- a/arangod/Documentation/implementor-manual.dox
+++ b/arangod/Documentation/implementor-manual.dox
@@ -105,12 +105,12 @@
 ///      <li>@ref A_JSF_GET_blueprints_vertex    "GET /_api/blueprints/vertex"</li>
 ///      <li>@ref A_JSF_PUT_blueprints_vertex    "PUT /_api/blueprints/vertex"</li>
 ///      <li>@ref A_JSF_DELETE_blueprints_vertex "DELETE /_api/blueprints/vertex"</li>
-///      <li>@ref A_JSF_GET_blueprints_vertices  "GET /_api/blueprints/vertices"</li>
+///      <li>@ref A_JSF_POST_blueprints_vertices  "POST /_api/blueprints/vertices"</li>
 ///      <li>@ref A_JSF_POST_blueprints_edge   "POST /_api/blueprints/edge"</li>
 ///      <li>@ref A_JSF_GET_blueprints_edge    "GET /_api/blueprints/edge"</li>
 ///      <li>@ref A_JSF_PUT_blueprints_edge    "PUT /_api/blueprints/edge"</li>
 ///      <li>@ref A_JSF_DELETE_blueprints_edge "DELETE /_api/blueprints/edge"</li>
-///      <li>@ref A_JSF_GET_blueprints_edges   "GET /_api/blueprints/edges"</li>
+///      <li>@ref A_JSF_POST_blueprints_edges   "POST /_api/blueprints/edges"</li>
 ///     </ul>
 ///    </li>
 ///   </ul>
diff --git a/arangod/Documentation/shell-collection.dox b/arangod/Documentation/shell-collection.dox
index b4db40ae6a..8e4c9e3625 100644
--- a/arangod/Documentation/shell-collection.dox
+++ b/arangod/Documentation/shell-collection.dox
@@ -166,15 +166,15 @@
 ///////////////////////////////////////////////////////////////
 ///
 /// @anchor ShellCollectionRead
-/// @copydetails JS_CollectionVocBase
+/// @copydetails JS_CollectionVocbase
 ///
 /// @CLEARPAGE
 /// @anchor ShellCollectionCreate
-/// @copydetails JS_CreateVocBase
+/// @copydetails JS_CreateVocbase
 ///
 /// @CLEARPAGE
 /// @anchor ShellCollectionReadAll
-/// @copydetails JS_CollectionsVocBase
+/// @copydetails JS_CollectionsVocbase
 ///
 /// @CLEARPAGE
 /// @anchor ShellCollectionReadShortCut
diff --git a/arangod/Utils/AqlTransaction.h b/arangod/Utils/AqlTransaction.h
index 12890ad74a..5906938d56 100644
--- a/arangod/Utils/AqlTransaction.h
+++ b/arangod/Utils/AqlTransaction.h
@@ -31,17 +31,12 @@
 namespace triagens {
   namespace arango {
 
+    class Transaction {
+
 // -----------------------------------------------------------------------------
 // --SECTION--                                              class AqlTransaction
 // -----------------------------------------------------------------------------
 
-    class Transaction {
-
-////////////////////////////////////////////////////////////////////////////////
-/// @addtogroup ArangoDB
-/// @{
-////////////////////////////////////////////////////////////////////////////////
-
 // -----------------------------------------------------------------------------
 // --SECTION--                                      constructors and destructors
 // -----------------------------------------------------------------------------
diff --git a/arangod/Utils/UserTransaction.h b/arangod/Utils/UserTransaction.h
index ab785de200..84f0cbb544 100644
--- a/arangod/Utils/UserTransaction.h
+++ b/arangod/Utils/UserTransaction.h
@@ -36,17 +36,12 @@
 namespace triagens {
   namespace arango {
 
-// -----------------------------------------------------------------------------
-// --SECTION--                                             class UserTransaction
-// -----------------------------------------------------------------------------
-
     template<typename T>
     class UserTransaction : public Transaction<T> {
 
-////////////////////////////////////////////////////////////////////////////////
-/// @addtogroup ArangoDB
-/// @{
-////////////////////////////////////////////////////////////////////////////////
+// -----------------------------------------------------------------------------
+// --SECTION--                                             class UserTransaction
+// -----------------------------------------------------------------------------
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                      constructors and destructors
@@ -84,6 +79,10 @@ namespace triagens {
           }
         }
 
+////////////////////////////////////////////////////////////////////////////////
+/// @}
+////////////////////////////////////////////////////////////////////////////////
+
 // -----------------------------------------------------------------------------
 // --SECTION--                                       virtual protected functions
 // -----------------------------------------------------------------------------
diff --git a/arangod/V8Server/v8-vocbase.cpp b/arangod/V8Server/v8-vocbase.cpp
index 331ad73055..338e9ed405 100755
--- a/arangod/V8Server/v8-vocbase.cpp
+++ b/arangod/V8Server/v8-vocbase.cpp
@@ -5056,7 +5056,7 @@ static v8::Handle<v8::Value> JS_CreateVocbase (v8::Arguments const& argv) {
 /// @FUN{db._createDocumentCollection(@FA{collection-name}, @FA{properties})}
 ///
 /// Creates a new document collection named @FA{collection-name}. 
-/// This is an alias for @ref JS_CreateVocBase, with the difference that the 
+/// This is an alias for @ref JS_CreateVocbase, with the difference that the 
 /// collection type is not automatically detected.
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -5087,7 +5087,7 @@ static v8::Handle<v8::Value> JS_CreateDocumentCollectionVocbase (v8::Arguments c
 ///
 /// @EXAMPLES
 ///
-/// See @ref JS_CreateVocBase for examples.
+/// See @ref JS_CreateVocbase for examples.
 ////////////////////////////////////////////////////////////////////////////////
 
 static v8::Handle<v8::Value> JS_CreateEdgeCollectionVocbase (v8::Arguments const& argv) {
diff --git a/html/admin/js/modules/simple-query-basics.js b/html/admin/js/modules/simple-query-basics.js
index 10c326a9d7..13fe73d9e7 100644
--- a/html/admin/js/modules/simple-query-basics.js
+++ b/html/admin/js/modules/simple-query-basics.js
@@ -324,7 +324,7 @@ SimpleQuery.prototype.execute = function () {
 /// @FUN{@FA{query}.limit(@FA{number})}
 ///
 /// Limits a result to the first @FA{number} documents. Specifying a limit of
-/// @CODE{0} returns no documents at all. If you do not need a limit, just do
+/// @LIT{0} returns no documents at all. If you do not need a limit, just do
 /// not add the limit operator. The limit must be non-negative.
 ///
 /// In general the input to @FN{limit} should be sorted. Otherwise it will be
diff --git a/js/actions/system/api-blueprints.js b/js/actions/system/api-blueprints.js
index b541d7334c..eccf79debb 100644
--- a/js/actions/system/api-blueprints.js
+++ b/js/actions/system/api-blueprints.js
@@ -245,7 +245,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief deletes a blueprint graph
 ///
-/// @RESTHEADER{DELETE /_api/blueprints/graph/@FA{graph-identifier},delete graph}
+/// @RESTHEADER{DELETE /_api/blueprints/graph,delete graph}
 ///
 /// @REST{DELETE /_api/blueprints/graph/@FA{graph-identifier}}
 ///
diff --git a/js/common/bootstrap/modules.js b/js/common/bootstrap/modules.js
index 0d2f658ce8..d44dff3008 100644
--- a/js/common/bootstrap/modules.js
+++ b/js/common/bootstrap/modules.js
@@ -222,11 +222,11 @@ module = ModuleCache["/"] = new Module("/");
 ///
 /// @FN{require} checks if the file specified by @FA{path} has already been
 /// loaded.  If not, the content of the file is executed in a new
-/// context. Within the context you can use the global variable @CODE{exports}
+/// context. Within the context you can use the global variable @LIT{exports}
 /// in order to export variables and functions. This variable is returned by
 /// @FN{require}.
 ///
-/// Assume that your module file is @CODE{test1.js} and contains
+/// Assume that your module file is @LIT{test1.js} and contains
 ///
 /// @verbinclude modules-require-1
 ///
diff --git a/js/common/modules/graph.js b/js/common/modules/graph.js
index c94837ff2f..a45b0011a6 100644
--- a/js/common/modules/graph.js
+++ b/js/common/modules/graph.js
@@ -440,7 +440,7 @@ Vertex.prototype.edges = function () {
 /// @FUN{@FA{vertex}.getId()}
 ///
 /// Returns the identifier of the @FA{vertex}. If the vertex was deleted, then
-/// @CODE{undefined} is returned.
+/// @LIT{undefined} is returned.
 ///
 /// @EXAMPLES
 ///
diff --git a/js/common/modules/simple-query-basics.js b/js/common/modules/simple-query-basics.js
index 09fa93e7f3..d13e8cac67 100644
--- a/js/common/modules/simple-query-basics.js
+++ b/js/common/modules/simple-query-basics.js
@@ -323,7 +323,7 @@ SimpleQuery.prototype.execute = function () {
 /// @FUN{@FA{query}.limit(@FA{number})}
 ///
 /// Limits a result to the first @FA{number} documents. Specifying a limit of
-/// @CODE{0} returns no documents at all. If you do not need a limit, just do
+/// @LIT{0} returns no documents at all. If you do not need a limit, just do
 /// not add the limit operator. The limit must be non-negative.
 ///
 /// In general the input to @FN{limit} should be sorted. Otherwise it will be
diff --git a/lib/ApplicationServer/ApplicationServer.cpp b/lib/ApplicationServer/ApplicationServer.cpp
index d2d09d630b..17a72ba21f 100644
--- a/lib/ApplicationServer/ApplicationServer.cpp
+++ b/lib/ApplicationServer/ApplicationServer.cpp
@@ -107,7 +107,7 @@ string const ApplicationServer::OPTIONS_SERVER = "Server Options";
 ////////////////////////////////////////////////////////////////////////////////
 
 #ifdef _WIN32
-ApplicationServer::ApplicationServer (string const& name, string const& title, string const& version)
+ApplicationServer::ApplicationServer (std::string const& name, std::string const& title, std::string const& version)
   : _options(),
     _description(),
     _descriptionFile(),
@@ -143,7 +143,7 @@ ApplicationServer::ApplicationServer (string const& name, string const& title, s
     _randomGenerator(5) {
 }
 #else
-ApplicationServer::ApplicationServer (string const& name, string const& title, string const& version)
+ApplicationServer::ApplicationServer (std::string const& name, std::string const& title, std::string const& version)
   : _options(),
     _description(),
     _descriptionFile(),
diff --git a/lib/ApplicationServer/ApplicationServer.h b/lib/ApplicationServer/ApplicationServer.h
index c4e710e1b7..861f303330 100644
--- a/lib/ApplicationServer/ApplicationServer.h
+++ b/lib/ApplicationServer/ApplicationServer.h
@@ -126,7 +126,7 @@ namespace triagens {
 /// @brief constructor
 ////////////////////////////////////////////////////////////////////////////////
 
-        ApplicationServer (const std::string& name, const std::string& title, const std::string& version);
+        ApplicationServer (std::string const& name, std::string const& title, std::string const& version);
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief destructor