diff --git a/src/Matrix.h b/src/Matrix.h
index 45bda5aed..55d00573e 100644
--- a/src/Matrix.h
+++ b/src/Matrix.h
@@ -26,7 +26,12 @@
 
 namespace Magnum {
 
-/** @brief Matrix */
+/**
+ * @brief Matrix
+ *
+ * @todo @c PERFORMANCE - implicit sharing
+ * @todo @c PERFORMANCE - loop unrolling for Matrix<T, 3> and Matrix<T, 4>
+ */
 template<class T, size_t size> class Matrix {
     public:
         /**
@@ -66,6 +71,8 @@ template<class T, size_t size> class Matrix {
         /**
          * @brief Set raw data
          * @param data One-dimensional array of @c size*size length in column-major order.
+         *
+         * @bug Creating Matrix<int, 5> from float* ??
          */
         inline void setData(const T* data) {
             memcpy(_data, data, size*size*sizeof(T));
diff --git a/src/Matrix4.h b/src/Matrix4.h
index 3c5192b58..5e4100447 100644
--- a/src/Matrix4.h
+++ b/src/Matrix4.h
@@ -25,7 +25,15 @@
 
 namespace Magnum {
 
-/** @brief Matrix 4x4 */
+/**
+ * @brief Matrix 4x4
+ *
+ * @todo @c PERFORMANCE - make (T,T,T) - (Vec3&lt;T&gt;) alternatives calling
+ *      direction based on statistics, which is used more frequently
+ * @todo Rotation with Euler angles
+ * @todo Shearing
+ * @todo Reflection
+ */
 template<class T> class Matrix4: public Matrix<T, 4> {
     public:
         /**