diff --git a/docs/docs.json b/docs/docs.json
index 715a3f683..25fe49752 100644
Binary files a/docs/docs.json and b/docs/docs.json differ
diff --git a/docs/generator/config.json b/docs/generator/config.json
index e6c07de1b..cab50ffd4 100644
--- a/docs/generator/config.json
+++ b/docs/generator/config.json
@@ -1,4 +1,4 @@
 {
   "GEN_VERSION": 10,
-  "COMPRESS": false
+  "COMPRESS": true
 }
\ No newline at end of file
diff --git a/docs/generator/generator.js b/docs/generator/generator.js
index 4c925576d..0c478522c 100644
--- a/docs/generator/generator.js
+++ b/docs/generator/generator.js
@@ -11,10 +11,13 @@ const docScanner = new DocumentationScanner(this);
 function parseDocs(json) {
   console.log(`${json.length} items found`);
   const documentation = new Documentation(json);
+  console.log('serializing');
   let output = JSON.stringify(documentation.serialize(), null, 0);
   if (compress) {
+    console.log('compressing');
     output = zlib.deflateSync(output).toString('utf8');
   }
+  console.log('writing to docs.json');
   fs.writeFileSync('./docs/docs.json', output);
 }
 
diff --git a/docs/generator/types/DocumentedClass.js b/docs/generator/types/DocumentedClass.js
index d20ebeaa1..323afafba 100644
--- a/docs/generator/types/DocumentedClass.js
+++ b/docs/generator/types/DocumentedClass.js
@@ -37,19 +37,19 @@ class DocumentedClass extends DocumentedItem {
       this.classConstructor = item;
     } else if (item instanceof DocumentedFunction) {
       if (this.methods.get(item.directData.name)) {
-        throw new Error(`Doc ${this.directData.name} already has method ${item.name}`);
+        throw new Error(`Doc ${this.directData.name} already has method ${item.directData.name}`);
       }
-      this.methods.set(item.name, item);
+      this.methods.set(item.directData.name, item);
     } else if (item instanceof DocumentedMember) {
       if (this.props.get(item.directData.name)) {
-        throw new Error(`Doc ${this.directData.name} already has prop ${item.name}`);
+        throw new Error(`Doc ${this.directData.name} already has prop ${item.directData.name}`);
       }
-      this.props.set(item.name, item);
+      this.props.set(item.directData.name, item);
     } else if (item instanceof DocumentedEvent) {
-      if (this.props.get(item.directData.name)) {
-        throw new Error(`Doc ${this.directData.name} already has event ${item.name}`);
+      if (this.events.get(item.directData.name)) {
+        throw new Error(`Doc ${this.directData.name} already has event ${item.directData.name}`);
       }
-      this.events.set(item.name, item);
+      this.events.set(item.directData.name, item);
     }
   }
 
diff --git a/src/client/websocket/WebSocketManager.js b/src/client/websocket/WebSocketManager.js
index 39aedae19..0e077cf55 100644
--- a/src/client/websocket/WebSocketManager.js
+++ b/src/client/websocket/WebSocketManager.js
@@ -52,10 +52,6 @@ class WebSocketManager {
    * @returns {null}
    */
   connect(gateway) {
-    /**
-     * The status of the Client's connection, a type of Constants.Status
-     * @type {Number}
-     */
     this.status = Constants.Status.CONNECTING;
     /**
      * The WebSocket connection to the gateway