More bug fixes

src/Client.js

@@ -154,17 +154,20 @@ class Client extends EventEmitter {
 							if (self.websocket) {
 								self.websocket.close();
 							}
+							self.debug("error logging in - " + err);
 							callback(err);
 							reject(err);
 						} else {
 							self.state = 2; //set state to logged in (not yet ready)
 							self.token = res.body.token; //set our token
-							
+							self.debug("client logged in w/ token " + self.token);
 							self.getGateway().then(function (url) {
+								self.debug("gateway response successful");
 								self.createws(url);
 								callback(null, self.token);
 								resolve(self.token);
 							}).catch(function (err) {
+								self.debug("unable to connect to gateways - " + err);
 								callback(err);
 								reject(err);
 							});

src/Member.js

@@ -6,10 +6,15 @@ class Member extends User{
 	
 	constructor(user, server, roles){
 		super(user); // should work, we are basically creating a Member that has the same properties as user and a few more
-		this.server = server;
+		this.serverID = server.id;
+		this.client = server.client;
 		this.rawRoles = roles;
 	}
 	
+	get server(){
+		return this.client.getServer("id", this.serverID);
+	}
+	
 	get roles(){
 		
 		var ufRoles = [ this.server.getRole("id", this.server.id) ];
@@ -80,11 +85,17 @@ class Member extends User{
 		
 		for(var overwrite of affectingOverwrites){
 			finalPacked = finalPacked & ~overwrite.deny;
+		}
+		
+		for(var overwrite of affectingOverwrites){
 			finalPacked = finalPacked | overwrite.allow;
 		}
 		
 		for(var overwrite of affectingMemberOverwrites){
 			finalPacked = finalPacked & ~overwrite.deny;
+		}
+		
+		for(var overwrite of affectingMemberOverwrites){
 			finalPacked = finalPacked | overwrite.allow;
 		}
 		

src/channel.js

@@ -3,7 +3,8 @@ var ChannelPermissions = require("./ChannelPermissions.js");
 class Channel {
 
     constructor(data, server) {
-        this.server = server;
+        this.serverID = server.id;
+        this.client = server.client;
         this.name = data.name;
         this.type = data.type;
         this.topic = data.topic;
@@ -18,6 +19,10 @@ class Channel {
         
         //this.isPrivate = isPrivate; //not sure about the implementation of this...
     }
+    
+    get server(){
+        return this.client.getServer("id", this.serverID);
+    }
 
     get permissionOverwrites() {
         return this.roles;
@@ -27,10 +32,6 @@ class Channel {
         return this.roles;
     }
 
-    get client() {
-        return this.server.client;
-    }
-
     permissionsOf(member){
         
         var mem = this.server.getMember("id", member.id);