diff --git a/src/Ratchet/Component/WAMP/WAMPServerComponent.php b/src/Ratchet/Component/WAMP/WAMPServerComponent.php
index 1f92993..c60f6c3 100644
--- a/src/Ratchet/Component/WAMP/WAMPServerComponent.php
+++ b/src/Ratchet/Component/WAMP/WAMPServerComponent.php
@@ -11,6 +11,9 @@ use Ratchet\Component\WAMP\Command\Action\Welcome;
 /**
  * WebSocket Application Messaging Protocol
  * 
+ * @link http://wamp.ws/spec
+ * @link https://github.com/oberstet/AutobahnJS
+ *
  * +--------------+----+------------------+
  * | Message Type | ID | DIRECTION        |
  * |--------------+----+------------------+
@@ -24,8 +27,6 @@ use Ratchet\Component\WAMP\Command\Action\Welcome;
  * | PUBLISH      | 7  | Client-to-Server |
  * | EVENT        | 8  | Server-to-Client |
  * +--------------+----+------------------+
- * @link http://wamp.ws/spec
- * @link https://github.com/oberstet/AutobahnJS
  */
 class WAMPServerComponent implements WebSocketComponentInterface {
     const MSG_WELCOME     = 0;
@@ -38,6 +39,9 @@ class WAMPServerComponent implements WebSocketComponentInterface {
     const MSG_PUBLISH     = 7;
     const MSG_EVENT       = 8;
 
+    /**
+     * @var WAMPServerComponentInterface
+     */
     protected $_decorating;
 
     /**
diff --git a/src/Ratchet/Component/WebSocket/WebSocketComponent.php b/src/Ratchet/Component/WebSocket/WebSocketComponent.php
index 51586bd..c85b28a 100644
--- a/src/Ratchet/Component/WebSocket/WebSocketComponent.php
+++ b/src/Ratchet/Component/WebSocket/WebSocketComponent.php
@@ -28,7 +28,7 @@ class WebSocketComponent implements MessageComponentInterface {
     protected $_factory;
 
     /**
-     * Singleton* instances of protocol version classes
+     * Re-entrant instances of protocol version classes
      * @internal
      */
     protected $_versions = array(
@@ -134,11 +134,15 @@ class WebSocketComponent implements MessageComponentInterface {
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function onClose(ConnectionInterface $conn) {
         return $this->prepareCommand($this->_decorating->onClose($conn));
     }
 
     /**
+     * {@inheritdoc}
      * @todo Shouldn't I be using prepareCommand() on the return? look into this
      */
     public function onError(ConnectionInterface $conn, \Exception $e) {