diff --git a/doomsday/client/include/world/surface.h b/doomsday/client/include/world/surface.h
index 4bac82b329..3231a54a97 100644
--- a/doomsday/client/include/world/surface.h
+++ b/doomsday/client/include/world/surface.h
@@ -35,7 +35,8 @@
 class BspLeaf;
 
 /**
- * World map surface.
+ * Models a "boundless" but otherwise geometric map surface. Boundless in the
+ * sense that surface has no edges.
  *
  * @ingroup world
  */
@@ -86,7 +87,10 @@ class Surface : public de::MapElement
     };
 #endif // __CLIENT__
 
-public: /// @todo make private:
+public:
+    /// @todo Decorations do not belong at this level. Plotting decorations
+    /// requires knowledge of the geometry (a BiasSurface-like abstraction
+    /// is needed one level up from this).
 #ifdef __CLIENT__
     struct DecorationData
     {