diff --git a/lib/Ratchet/Command/CloseConnection.php b/lib/Ratchet/Command/CloseConnection.php
index f190669..4e36dc3 100644
--- a/lib/Ratchet/Command/CloseConnection.php
+++ b/lib/Ratchet/Command/CloseConnection.php
@@ -2,7 +2,13 @@
 namespace Ratchet\Command;
 use Ratchet\SocketCollection;
 
+/**
+ * Close the connection to the sockets passed in the constructor
+ */
 class CloseConnection implements CommandInterface {
+    /**
+     * @var SocketCollection
+     */
     protected $_sockets;
 
     public function __construct(SocketCollection $sockets) {
@@ -10,6 +16,8 @@ class CloseConnection implements CommandInterface {
     }
 
     function execute() {
-        $this->_sockets->close();
+        foreach ($this->_sockets as $socket) {
+            $socket->close();
+        }
     }
 }
\ No newline at end of file
diff --git a/lib/Ratchet/Command/CommandInterface.php b/lib/Ratchet/Command/CommandInterface.php
index ca45e57..f65e21a 100644
--- a/lib/Ratchet/Command/CommandInterface.php
+++ b/lib/Ratchet/Command/CommandInterface.php
@@ -2,8 +2,18 @@
 namespace Ratchet\Command;
 use Ratchet\SocketCollection;
 
+/**
+ * Socket implementation of the Command Pattern
+ * User created applications are to return a Command to the server for execution
+ */
 interface CommandInterface {
+    /**
+     * Pass the Sockets to execute the command on
+     */
     function __construct(SocketCollection $sockets);
 
+    /**
+     * The Server class will call the execution
+     */
     function execute();
 }
\ No newline at end of file
diff --git a/lib/Ratchet/Command/Null.php b/lib/Ratchet/Command/Null.php
index 67865d1..c9c326b 100644
--- a/lib/Ratchet/Command/Null.php
+++ b/lib/Ratchet/Command/Null.php
@@ -2,6 +2,9 @@
 namespace Ratchet\Command;
 use Ratchet\SocketCollection;
 
+/**
+ * Null pattern - execution does nothing, something needs to be passed back though
+ */
 class Null implements CommandInterface {
     public function __construct(SocketCollection $sockets) {
     }
diff --git a/lib/Ratchet/Command/SendMessage.php b/lib/Ratchet/Command/SendMessage.php
index 298d132..ca01b47 100644
--- a/lib/Ratchet/Command/SendMessage.php
+++ b/lib/Ratchet/Command/SendMessage.php
@@ -2,22 +2,43 @@
 namespace Ratchet\Command;
 use Ratchet\SocketCollection;
 
+/**
+ * Send text back to the client end of the socket(s)
+ */
 class SendMessage implements CommandInterface {
+    /**
+     * @var SocketCollection
+     */
     protected $_sockets;
+
+    /**
+     * @var string
+     */
     protected $_message = '';
 
     public function __construct(SocketCollection $sockets) {
         $this->_sockets = $sockets;
     }
 
+    /**
+     * The message to send to the socket(s)
+     * @param string
+     */
     public function setMessage($msg) {
         $this->_message = (string)$msg;
     }
 
+    /**
+     * Get the message from setMessage()
+     * @return string
+     */
     public function getMessage() {
         return $this->_message;
     }
 
+    /**
+     * @throws \UnexpectedValueException if a message was not set with setMessage()
+     */
     public function execute() {
         if (empty($this->_message)) {
             throw new \UnexpectedValueException("Message is empty");
diff --git a/lib/Ratchet/Exception.php b/lib/Ratchet/Exception.php
index 62e2fb1..c1f217a 100644
--- a/lib/Ratchet/Exception.php
+++ b/lib/Ratchet/Exception.php
@@ -1,6 +1,9 @@
 <?php
 namespace Ratchet;
 
+/**
+ * Uses internal php methods to fill an Exception class (no parameters required)
+ */
 class Exception extends \Exception {
     public function __construct() {
         $int = socket_last_error();
diff --git a/lib/Ratchet/Logging/LoggerInterface.php b/lib/Ratchet/Logging/LoggerInterface.php
index 8c0e01f..4b8020d 100644
--- a/lib/Ratchet/Logging/LoggerInterface.php
+++ b/lib/Ratchet/Logging/LoggerInterface.php
@@ -1,18 +1,24 @@
 <?php
 namespace Ratchet\Logging;
 
+/**
+ * A logger used by the server and extending applications for debugging info
+ */
 interface LoggerInterface {
     /**
+     * Just an informational log
      * @param string
      */
     function note($msg);
 
     /**
+     * A problem, but nothing too serious
      * @param string
      */
     function warning($msg);
 
     /**
+     * Bad things have happened...
      * @param string
      */
     function error($msg);
diff --git a/lib/Ratchet/Logging/MonologAdapter.php b/lib/Ratchet/Logging/MonologAdapter.php
index d38ecf0..8339de4 100644
--- a/lib/Ratchet/Logging/MonologAdapter.php
+++ b/lib/Ratchet/Logging/MonologAdapter.php
@@ -2,6 +2,9 @@
 namespace Ratchet\Logging;
 use Monolog\Logger;
 
+/**
+ * Adapt the awesome Monolog Logger into the lowly Ratchet Logger
+ */
 class MonologAdapter extends Logger implements LoggerInterface {
     /**
      * Maps to Monolog\Logger::addInfo
diff --git a/lib/Ratchet/Logging/NullLogger.php b/lib/Ratchet/Logging/NullLogger.php
index 3e92ed3..78c4f9b 100644
--- a/lib/Ratchet/Logging/NullLogger.php
+++ b/lib/Ratchet/Logging/NullLogger.php
@@ -1,6 +1,10 @@
 <?php
 namespace Ratchet\Logging;
 
+/**
+ * Sends all logs into the void
+ * No one can hear you scream in /dev/null
+ */
 class NullLogger implements LoggerInterface {
     function note($msg) {
     }
diff --git a/lib/Ratchet/Protocol/WebSocket.php b/lib/Ratchet/Protocol/WebSocket.php
index 94b6efe..e7921c1 100644
--- a/lib/Ratchet/Protocol/WebSocket.php
+++ b/lib/Ratchet/Protocol/WebSocket.php
@@ -7,6 +7,8 @@ use Ratchet\SocketInterface;
 use Ratchet\ReceiverInterface;
 
 /**
+ * The adapter to handle WebSocket requests/responses
+ * This is a mediator between the Server and your application to handle real-time messaging through a web browser
  * @link http://ca.php.net/manual/en/ref.http.php
  * @todo Make sure this works both ways (client/server) as stack needs to exist on client for framing
  * @todo Clean up Client/Version stuff.  This should be a factory making single instances of Version classes, implement chain of reponsibility for version - client should implement an interface?
diff --git a/lib/Ratchet/Protocol/WebSocket/AppInterface.php b/lib/Ratchet/Protocol/WebSocket/AppInterface.php
index 2dedc13..4e04fb0 100644
--- a/lib/Ratchet/Protocol/WebSocket/AppInterface.php
+++ b/lib/Ratchet/Protocol/WebSocket/AppInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Protocol\Websocket;
+namespace Ratchet\Protocol\WebSocket;
 use Ratchet\ReceiverInterface;
 
 /**
diff --git a/lib/Ratchet/Protocol/WebSocket/Client.php b/lib/Ratchet/Protocol/WebSocket/Client.php
index 51608d5..fd65d91 100644
--- a/lib/Ratchet/Protocol/WebSocket/Client.php
+++ b/lib/Ratchet/Protocol/WebSocket/Client.php
@@ -2,19 +2,22 @@
 namespace Ratchet\Protocol\WebSocket;
 use Ratchet\Protocol\WebSocket\Version\VersionInterface;
 
+/**
+ * A representation of a Socket connection of the user on the other end of the socket
+ */
 class Client {
     /**
-     * @type Ratchet\Protocol\WebSocket\Version\VersionInterface
+     * @var Ratchet\Protocol\WebSocket\Version\VersionInterface
      */
     protected $_version = null;
 
     /**
-     * @type bool
+     * @var bool
      */
     protected $_hands_shook = false;
 
     /**
-     * @param VersionInterface
+     * @param Version\VersionInterface
      * @return Client
      */
     public function setVersion(VersionInterface $version) {
@@ -23,7 +26,7 @@ class Client {
     }
 
     /**
-     * @return VersionInterface
+     * @return Version\VersionInterface
      */
     public function getVersion() {
         return $this->_version;
diff --git a/lib/Ratchet/Protocol/WebSocket/Version/Hixie76.php b/lib/Ratchet/Protocol/WebSocket/Version/Hixie76.php
index a5d5993..b97786f 100644
--- a/lib/Ratchet/Protocol/WebSocket/Version/Hixie76.php
+++ b/lib/Ratchet/Protocol/WebSocket/Version/Hixie76.php
@@ -1,6 +1,10 @@
 <?php
 namespace Ratchet\Protocol\WebSocket\Version;
 
+/**
+ * The Hixie76 is currently implemented by Safari
+ * Not yet complete
+ */
 class Hixie76 implements VersionInterface {
     public function handshake(array $headers) {
     }
diff --git a/lib/Ratchet/Protocol/WebSocket/Version/Hybi10.php b/lib/Ratchet/Protocol/WebSocket/Version/Hybi10.php
index 67cba81..cbb62b9 100644
--- a/lib/Ratchet/Protocol/WebSocket/Version/Hybi10.php
+++ b/lib/Ratchet/Protocol/WebSocket/Version/Hybi10.php
@@ -1,11 +1,13 @@
 <?php
 namespace Ratchet\Protocol\WebSocket\Version;
 
+/**
+ * The HyBi-10 version, identified in the headers as version 8, is currently implemented by the latest Chrome and Firefix version
+ * @link http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10
+ */
 class Hybi10 implements VersionInterface {
     const GUID = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11';
 
-    /**
-     */
     public function handshake(array $headers) {
         $key = $this->sign($headers['Sec-Websocket-Key']);
 
diff --git a/lib/Ratchet/Protocol/WebSocket/Version/VersionInterface.php b/lib/Ratchet/Protocol/WebSocket/Version/VersionInterface.php
index 817344b..59e5b27 100644
--- a/lib/Ratchet/Protocol/WebSocket/Version/VersionInterface.php
+++ b/lib/Ratchet/Protocol/WebSocket/Version/VersionInterface.php
@@ -1,6 +1,10 @@
 <?php
 namespace Ratchet\Protocol\WebSocket\Version;
 
+/**
+ * Despite the version iterations of WebInterface the actions they go through are similar
+ * This standardizes how the server handles communication with each protocol version
+ */
 interface VersionInterface {
     /**
      * Perform the handshake and return the response headers
diff --git a/lib/Ratchet/ReceiverInterface.php b/lib/Ratchet/ReceiverInterface.php
index 0c52b7a..ff9b702 100644
--- a/lib/Ratchet/ReceiverInterface.php
+++ b/lib/Ratchet/ReceiverInterface.php
@@ -4,6 +4,7 @@ use Ratchet\Server;
 use Ratchet\SocketObserver;
 
 /**
+ * Decorator interface for internal protocols
  * @todo Should probably move this into \Ratchet\Server namespace
  */
 interface ReceiverInterface extends SocketObserver {
diff --git a/lib/Ratchet/Server.php b/lib/Ratchet/Server.php
index 59a547c..0aeb25c 100644
--- a/lib/Ratchet/Server.php
+++ b/lib/Ratchet/Server.php
@@ -6,6 +6,7 @@ use Ratchet\Logging\LoggerInterface;
 use Ratchet\Logging\NullLogger;
 
 /**
+ * Creates an open-ended socket to listen on a port for incomming connections.  Events are delegated through this to attached applications
  * @todo Consider using _connections as master reference and passing iterator_to_array(_connections) to socket_select
  * @todo Move SocketObserver methods to separate class, create, wrap class in __construct
  * @todo Currently passing Socket object down the decorated chain - should be sending reference to it instead; Receivers do not interact with the Socket directly, they do so through the Command pattern
@@ -48,7 +49,6 @@ class Server implements SocketObserver, \IteratorAggregate {
     /**
      * @param Ratchet\Socket
      * @param ReceiverInterface
-     * @param boolean True, enables debug mode and the server doesn't infiniate loop
      * @param Logging\LoggerInterface
      */
     public function __construct(SocketInterface $host, ReceiverInterface $application, LoggerInterface $logger = null) {
@@ -128,8 +128,8 @@ class Server implements SocketObserver, \IteratorAggregate {
     }
 
     /*
-     * @param mixed
-     * @param int
+     * @param mixed The address to listen for incoming connections on.  "0.0.0.0" to listen from anywhere
+     * @param int The port to listen to connections on
      * @throws Exception
      * @todo Validate address.  Use socket_get_option, if AF_INET must be IP, if AF_UNIX must be path
      * @todo Should I make handling open/close/msg an application?
diff --git a/lib/Ratchet/ServerInterface.php b/lib/Ratchet/ServerInterface.php
index 5b76821..448a21e 100644
--- a/lib/Ratchet/ServerInterface.php
+++ b/lib/Ratchet/ServerInterface.php
@@ -1,6 +1,9 @@
 <?php
 namespace Ratchet;
 
+/**
+ * @deprecated
+ */
 interface ServerInterface extends \IteratorAggregate {
     function attatchReceiver(ReceiverInterface $receiver);
 
diff --git a/lib/Ratchet/SocketCollection.php b/lib/Ratchet/SocketCollection.php
index d1934c3..1c3b918 100644
--- a/lib/Ratchet/SocketCollection.php
+++ b/lib/Ratchet/SocketCollection.php
@@ -1,12 +1,17 @@
 <?php
 namespace Ratchet;
 
+/**
+ * A self-deprecating queue that can only hold Socket objects
+ */
 class SocketCollection extends \SplQueue {
     public function __construct() {
-//        parent::__construct();
         $this->setIteratorMode(static::IT_MODE_DELETE);
     }
 
+    /**
+     * @param SocketInterface
+     */
     public function enqueue(SocketInterface $value) {
         parent::enqueue($value);
     }
diff --git a/lib/Ratchet/SocketInterface.php b/lib/Ratchet/SocketInterface.php
index 15b93a3..3230bba 100644
--- a/lib/Ratchet/SocketInterface.php
+++ b/lib/Ratchet/SocketInterface.php
@@ -1,19 +1,27 @@
 <?php
 namespace Ratchet;
 
+/**
+ * An object-oriented container for a single socket connection
+ */
 interface SocketInterface {
     /**
+     * Send text to the client on the other end of the socket
      * @param string
      * @param int
      */
     function write($buffer, $length = 0);
 
     /**
+     * Called when the client sends data to the server through the socket
      * @param string
      * @param int
      * @param int
      */
     function recv(&$buf, $len, $flags);
 
+    /**
+     * Close the open connection to the client/socket
+     */
     function close();
 }
\ No newline at end of file
diff --git a/lib/Ratchet/SocketObserver.php b/lib/Ratchet/SocketObserver.php
index 37f431a..d0d6eb0 100644
--- a/lib/Ratchet/SocketObserver.php
+++ b/lib/Ratchet/SocketObserver.php
@@ -1,19 +1,25 @@
 <?php
 namespace Ratchet;
 
+/**
+ * Observable/Observer design pattern interface for handing events on a socket
+ */
 interface SocketObserver {
     /**
+     * When a new connection is opened it will be passed to this method
      * @param SocketInterface
      */
     function onOpen(SocketInterface $conn);
 
     /**
+     * Triggered when a client sends data through the socket
      * @param SocketInterface
      * @param string
      */
     function onRecv(SocketInterface $from, $msg);
 
     /**
+     * This is called just before the connection is closed
      * @param SocketInterface
      */
     function onClose(SocketInterface $conn);