diff --git a/plugins/ctcp.py b/plugins/ctcp.py
index ba7c7c2..523a4e4 100755
--- a/plugins/ctcp.py
+++ b/plugins/ctcp.py
@@ -1,6 +1,4 @@
-# Plugin by neersighted
 import time
-import getpass
 from util import hook
 
 
@@ -18,8 +16,3 @@ def ctcp_ping(inp, notice=None):
 @hook.regex(r'^\x01TIME\x01$')
 def ctcp_time(inp, notice=None):
     notice('\x01TIME: The time is: %s' % time.strftime("%r", time.localtime()))
-
-
-@hook.regex(r'^\x01FINGER\x01$')
-def ctcp_finger(inp, notice=None):
-    notice('\x01FINGER: Username is: $s' % getpass.getuser())
diff --git a/plugins/geoip.py b/plugins/geoip.py
index 32497da..5ab1895 100755
--- a/plugins/geoip.py
+++ b/plugins/geoip.py
@@ -22,6 +22,8 @@ else:
     output.write(geoip_file.read())
     output.close()
 
+    geo = pygeoip.GeoIP(os.path.abspath("./plugins/data/GeoLiteCity.dat"))
+
 
 @hook.command
 def geoip(inp):
@@ -48,4 +50,3 @@ def geoip(inp):
     data["country"] = record["country_name"] or "Unknown"
     data["city"] = record["city"] or "Unknown"
     return "\x02Country:\x02 {country} ({cc}), \x02City:\x02 {city}{region}".format(**data)
-
diff --git a/plugins/mcping.py b/plugins/mcping.py
new file mode 100644
index 0000000..6332f5f
--- /dev/null
+++ b/plugins/mcping.py
@@ -0,0 +1,94 @@
+from util import hook, http
+import socket
+import struct
+
+try:
+    import DNS 
+    # Please remember to install the dependancy 'pydns'
+    pydns_installed = True
+except ImportError:
+    pydns_installed = False
+
+def format_motd(motd):
+    empty = ""
+    colors = [u"\x0300,\xa7f", u"\x0301,\xa70", u"\x0302,\xa71", u"\x0303,\xa72", u"\x0304,\xa7c", u"\x0305,\xa74", u"\x0306,\xa75", u"\x0307,\xa76", u"\x0308,\xa7e", u"\x0309,\xa7a", u"\x0310,\xa73", u"\x0311,\xa7b", u"\x0312,\xa71", u"\x0313,\xa7d", u"\x0314,\xa78", u"\x0315,\xa77", u"\x02,\xa7l", u"\x0310,\xa79", u"\x09,\xa7o", u"\x13,\xa7m", u"\x0f,\xa7r", u"\x15,\xa7n"];
+    for s in colors:
+        lcol = s.split(",")
+        motd = motd.replace(lcol[1], lcol[0])
+    motd = motd.replace(u"\xa7k", empty)
+    return motd
+
+
+def mcping_connect(host, port):
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    try:
+        sock.connect((host, port))
+        sock.send('\xfe\x01')
+        response = sock.recv(1)
+        print response
+
+        if response[0] != '\xff':
+            return "Server gave invalid response: " + repr(response)
+        length = struct.unpack('!h', sock.recv(2))[0]
+
+        values = sock.recv(length * 2).decode('utf-16be')
+
+        data = values.split(u'\x00')  # try to decode data using new format
+        if len(data) == 1:
+            # failed to decode data, server is using old format
+            data = values.split(u'\xa7')
+            message = u"{} - {}/{} players".format(data[0], data[1], data[2])
+        else:
+            # decoded data, server is using new format
+            message = u"{} \x0f- {} - {}/{} players".format(data[3], data[2], data[4], data[5])
+
+        sock.close()
+        return message
+
+    except:
+        return "Error pinging " + host + ":" + str(port) +\
+        ", is it up? Double-check your address!"
+
+
+def srvData(domain):
+    DNS.ParseResolvConf()
+    srv_req = DNS.Request(qtype='srv')
+    srv_result = srv_req.req('_minecraft._tcp.{}'.format(domain))
+
+    for getsrv in srv_result.answers:
+        if getsrv['typename'] == 'SRV':
+            data = [getsrv['data'][2],getsrv['data'][3]]
+            return data
+
+
+@hook.command
+def mcping(inp):
+    "mcping <server>[:port] - Ping a Minecraft server to check status."
+    inp = inp.strip().split(" ")[0]
+
+    if ":" in inp:
+        host, port = inp.split(":", 1)
+        try:
+            port = int(port)
+        except:
+            return "error: invalid port!"
+        return format_motd(mcping_connect(host, port))
+
+    else:
+        host = inp
+        port = 25565
+        rdata = format_motd(mcping_connect(host, port))
+
+        if 'is it up' in rdata:
+            if pydns_installed:
+                getdata = srvData(inp)
+                try:
+                    host = str(getdata[1])
+                    port = int(getdata[0])
+                    return format_motd(mcping_connect(host, port))
+                except: 
+                    return "Error pinging %s, is it up? Double-check your address!" % inp
+            else:
+                return "Error pinging %s, is it up? Double-check your address!" % inp
+        else:
+            return rdata
diff --git a/plugins/mctools.py b/plugins/mctools.py
index ea137c5..bcd3bed 100755
--- a/plugins/mctools.py
+++ b/plugins/mctools.py
@@ -1,65 +1,5 @@
 from util import hook, http
-import socket
 import json
-import struct
-
-try:
-    import DNS ## Please remember to install the dependancy 'pydns'
-    pydns_installed = True
-except ImportError:
-    pydns_installed = False
-
-
-def format_motd(motd):
-    empty = ""
-    colors = [u"\x0300,\xa7f", u"\x0301,\xa70", u"\x0302,\xa71", u"\x0303,\xa72", u"\x0304,\xa7c", u"\x0305,\xa74", u"\x0306,\xa75", u"\x0307,\xa76", u"\x0308,\xa7e", u"\x0309,\xa7a", u"\x0310,\xa73", u"\x0311,\xa7b", u"\x0312,\xa71", u"\x0313,\xa7d", u"\x0314,\xa78", u"\x0315,\xa77", u"\x02,\xa7l", u"\x0310,\xa79", u"\x09,\xa7o", u"\x13,\xa7m", u"\x0f,\xa7r", u"\x15,\xa7n"];
-    for s in colors:
-        lcol = s.split(",")
-        motd = motd.replace(lcol[1], lcol[0])
-    motd = motd.replace(u"\xa7k", empty)
-    return motd
-
-
-def mcping_connect(host, port):
-    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    try:
-        sock.connect((host, port))
-        sock.send('\xfe\x01')
-        response = sock.recv(1)
-        print response
-
-        if response[0] != '\xff':
-            return "Server gave invalid response: " + repr(response)
-        length = struct.unpack('!h', sock.recv(2))[0]
-
-        values = sock.recv(length * 2).decode('utf-16be')
-
-        data = values.split(u'\x00')  # try to decode data using new format
-        if len(data) == 1:
-            # failed to decode data, server is using old format
-            data = values.split(u'\xa7')
-            message = u"{} - {}/{} players".format(data[0], data[1], data[2])
-        else:
-            # decoded data, server is using new format
-            message = u"{} \x0f- {} - {}/{} players".format(data[3], data[2], data[4], data[5])
-
-        sock.close()
-        return message
-
-    except:
-        return "Error pinging " + host + ":" + str(port) +\
-        ", is it up? Double-check your address!"
-
-
-def srvData(domain):
-    DNS.ParseResolvConf()
-    srv_req = DNS.Request(qtype='srv')
-    srv_result = srv_req.req('_minecraft._tcp.{}'.format(domain))
-
-    for getsrv in srv_result.answers:
-        if getsrv['typename'] == 'SRV':
-            data = [getsrv['data'][2],getsrv['data'][3]]
-            return data
 
 
 @hook.command(autohelp=False)
@@ -101,36 +41,3 @@ def mcpaid(inp):
         return 'The account "{}" is a premium Minecraft account!'.format(inp)
     else:
         return 'The account "{}" is not a premium Minecraft account!'.format(inp)
-
-
-@hook.command
-def mcping(inp):
-    "mcping <server>[:port] - Ping a Minecraft server to check status."
-    inp = inp.strip().split(" ")[0]
-
-    if ":" in inp:
-        host, port = inp.split(":", 1)
-        try:
-            port = int(port)
-        except:
-            return "error: invalid port!"
-        return format_motd(mcping_connect(host, port))
-
-    else:
-        host = inp
-        port = 25565
-        rdata = format_motd(mcping_connect(host, port))
-
-        if 'is it up' in rdata:
-            if pydns_installed:
-                getdata = srvData(inp)
-                try:
-                    host = str(getdata[1])
-                    port = int(getdata[0])
-                    return format_motd(mcping_connect(host, port))
-                except: 
-                    return "Error pinging %s, is it up? Double-check your address!" % inp
-            else:
-                return "Error pinging %s, is it up? Double-check your address!" % inp
-        else:
-            return rdata