diff --git a/cogs/add.py b/cogs/add.py
index e3cc992..c8a1d29 100644
--- a/cogs/add.py
+++ b/cogs/add.py
@@ -82,10 +82,10 @@ async def add(self,
             if not await check_character_name(self.bot, char_class):
                 return
             author = ctx.message.author
-            server = ctx.message.server
+            discord_server = ctx.message.server
             roles = [u.name for u in author.roles]
-            rank, discord_user = await self.__get_rank_and_discord_id(author, user, roles)
-            member = self.__get_server_and_member(server, discord_user)
+            rank, discord_user = await self.__get_rank_and_member(author, user, roles)
+            server, member = self.__get_server_and_member(discord_server, discord_user)
 
             if rank is None or discord_user.id is None:
                 return
@@ -99,7 +99,7 @@ async def add(self,
                 'fam_name': fam_name.upper(),
                 'char_name': char_name.upper(),
                 'char_class': char_class.upper(),
-                'server': server.id,
+                'server': discord_server.id,
                 'level': level,
                 'ap': ap,
                 'dp': dp,
@@ -113,7 +113,7 @@ async def add(self,
             row = get_row([character], False)
             data = tabulate(row, HEADERS, 'simple')
 
-            await self.bot.say(codify("Success Adding Character for member {}\n\n".
+            await self.bot.say(codify("Success Adding Character for member {} :D\n\n".
                                       format(discord_user.name.upper()) + data))
 
         except Exception as e:
diff --git a/cogs/general.py b/cogs/general.py
index adc2817..81a0ef7 100644
--- a/cogs/general.py
+++ b/cogs/general.py
@@ -48,7 +48,7 @@ async def info(self, ctx):
     async def export(self, ctx):
         """Exports current guild data"""
 
-        members = Character.objects(server=ctx.message.server.id)
+        members = Character.primary_chars(server=ctx.message.server.id)
         rows = get_row(members, False)
         rows.insert(0, HEADERS)
         try:
diff --git a/cogs/search.py b/cogs/search.py
index 62a2a4c..5a7eee7 100644
--- a/cogs/search.py
+++ b/cogs/search.py
@@ -20,7 +20,7 @@ async def lookup(self, ctx, query):
         try:
             mentions = ctx.message.mentions
             if len(mentions) >= 1:
-                members = Character.primary_chars(discord=mentions[0].id)
+                members = Character.primary_chars(member=mentions[0].id)
             else:
                 members = Character.primary_chars(Q(fam_name__icontains = query) | Q(char_name__icontains = query),
                                          server = ctx.message.server.id)
diff --git a/models/character.py b/models/character.py
index 5ff39ab..31b99df 100644
--- a/models/character.py
+++ b/models/character.py
@@ -28,7 +28,6 @@ class Character(Document, ModelMixin):
     fam_name = StringField(max_lenght=50)
     char_name = StringField(max_lenght=50)
     char_class = StringField(max_lenght=50)
-    server = StringField()
     level = IntField(max_lenght=4)
     ap = IntField(max_lenght=5)
     dp = IntField(max_lenght=5)