diff --git a/doc/MainPage.dox b/doc/MainPage.dox
index d14e58748..16f108e3e 100644
--- a/doc/MainPage.dox
+++ b/doc/MainPage.dox
@@ -4,8 +4,10 @@ namespace Magnum {
 <p><strong>%Magnum</strong> is simple graphical engine written in C++11 and OpenGL 3 Core Profile. Features:</p>
 <ul>
 <li>Easy-to-use templated @ref Math "mathematical library" for matrix/vector calculations.</li>
-<li>Hierarchical @ref Scene "scene graph" which supports transformation caching for better performance.</li>
-<li>Classes for convenient usage of @ref AbstractShaderProgram "shaders", @ref Buffer "buffers" and @ref Texture "textures".</li>
+<li>Comprehensive use of C++11 features for security, performance and ease of development.</li>
+<li>Hierarchical @ref Scene "scene graph" which supports transformation caching for better performance, classes for convenient usage of @ref AbstractShaderProgram "shaders", @ref Buffer "buffers" and @ref Texture "textures".</li>
+<li>@ref MeshTools "Mesh tools" for cleaning, optimizing and generating meshes.</li>
+<li>Collection of pre-made @ref Primitives "graphic primitives" for testing purposes.</li>
 </ul>
 
 @section BasicUsage Basic usage
diff --git a/doc/namespaces.dox b/doc/namespaces.dox
deleted file mode 100644
index e73f42ea2..000000000
--- a/doc/namespaces.dox
+++ /dev/null
@@ -1,11 +0,0 @@
-/** @namespace Magnum
-@brief Root namespace
-
-Contains classes needed for building meshes, setting up and rendering the scene.
-*/
-
-/** @namespace Magnum::Math
-@brief Math library
-
-Template classes for matrix and vector calculations.
-*/
diff --git a/src/Camera.h b/src/Camera.h
index 47d817751..087ccfe22 100644
--- a/src/Camera.h
+++ b/src/Camera.h
@@ -120,7 +120,7 @@ class Camera: public Object {
          */
         void setViewport(const Math::Vector2<unsigned int>& size);
 
-        /** @copydoc setViewport(const Math::Vector2<size_t>& size); */
+        /** @copydoc setViewport(const Math::Vector2<unsigned int>& size); */
         inline void setViewport(unsigned int width, unsigned int height) {
             setViewport({width, height});
         }
diff --git a/src/Magnum.h b/src/Magnum.h
index e7ad68e3d..1922d8fc7 100644
--- a/src/Magnum.h
+++ b/src/Magnum.h
@@ -24,6 +24,12 @@
 #include "Math/Matrix4.h"
 #include "Math/Vector2.h"
 
+/**
+ * @brief Root namespace
+ *
+ * Contains classes needed for building meshes, setting up and rendering the
+ * scene.
+ */
 namespace Magnum {
 
 /** @brief Two-component floating-point vector */
diff --git a/src/Math/Math.h b/src/Math/Math.h
index 2ea939847..6043ed800 100644
--- a/src/Math/Math.h
+++ b/src/Math/Math.h
@@ -21,7 +21,14 @@
  * @brief Math constants and utilities
  */
 
-namespace Magnum { namespace Math {
+namespace Magnum {
+
+/**
+ * @brief %Math library
+ *
+ * Template classes for matrix and vector calculations.
+*/
+namespace Math {
 
 /** @brief Pi */
 #define PI 3.1415926535
diff --git a/src/Primitives/AbstractPrimitive.h b/src/Primitives/AbstractPrimitive.h
index 68fa8d169..09bb5dd3c 100644
--- a/src/Primitives/AbstractPrimitive.h
+++ b/src/Primitives/AbstractPrimitive.h
@@ -28,6 +28,11 @@ namespace Magnum {
 class Buffer;
 class IndexedMesh;
 
+/**
+ * @brief %Primitive library
+ *
+ * Basic primitives usable for testing.
+ */
 namespace Primitives {
 
 /**
diff --git a/src/Primitives/Icosphere.h b/src/Primitives/Icosphere.h
index 0bef205b6..872ced25d 100644
--- a/src/Primitives/Icosphere.h
+++ b/src/Primitives/Icosphere.h
@@ -16,7 +16,7 @@
 */
 
 /** @file
- * @brief Class Magnum::Primitives::Icosphere
+ * @brief Class Magnum::Primitives::Icosahedron, Magnum::Primitives::Icosphere
  */
 
 #include "AbstractPrimitive.h"