diff --git a/development.conf b/development.conf
deleted file mode 100644
index 0a03c88..0000000
--- a/development.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[tg]
-owner = ONWER_ID
-token = TOKEN
-
-[wa]
-phone = PHONE_NUMBER
-password = PASSWORD
-
-[db]
-path = PATH_TO_DB
diff --git a/run.sh b/run.sh
old mode 100644
new mode 100755
diff --git a/status.sh b/status.sh
old mode 100644
new mode 100755
diff --git a/wat_bridge/wa.py b/wat_bridge/wa.py
index 3bce2c5..852a4e0 100644
--- a/wat_bridge/wa.py
+++ b/wat_bridge/wa.py
@@ -92,7 +92,10 @@ def on_message(self, message):
         # body = "NULL"
         if message.getType() == "text":
             logger.debug("is text message")
-            body = message.getBody().decode()
+            if(isinstance(message, TextMessageProtocolEntity)):
+                body = message.conversation
+            else:
+                body = message.text
 
             if body == '/getID' or body == '/link':
                 self.send_msg(phone=sender, message="/link " + sender)
@@ -163,10 +166,12 @@ def on_message(self, message):
             SIGNAL_TG.send('wabot', phone=sender, message=TheRealMessageToSend, media=False)
 
         if message.getType() == "media":
+            pass
+            """
           if not os.path.exists("./DOWNLOADS"):
             os.makedirs("./DOWNLOADS")
           # set unique filename
-          uniqueFilename = "./DOWNLOADS/%s-%s%s" % (hashlib.md5(str(message.getFrom(False)).encode('utf-8')).hexdigest(), uuid.uuid4().hex, message.getExtension())
+          uniqueFilename = "./DOWNLOADS/%s-%s%s" % (hashlib.md5(str(message.getFrom(False)).encode('utf-8')).hexdigest(), uuid.uuid4().hex, ".jpg")
           if message.getMediaType() == "image":
             logger.info("Echoing image %s to %s" % (message.url, message.getFrom(False)))
             data = message.getMediaContent()
@@ -205,6 +210,7 @@ def on_message(self, message):
           # Relay to Telegram
           logger.info('relaying message to Telegram')
           SIGNAL_TG.send('wabot', phone=sender, message=TheRealMessageToSend, media=True)
+            """
 
     @ProtocolEntityCallback('receipt')
     def on_receipt(self, entity):
@@ -260,7 +266,7 @@ def send_msg(self, **kwargs):
 
 WA_STACK = (
     YowStackBuilder()
-	.pushDefaultLayers(True)
+	.pushDefaultLayers()
 	# .pushDefaultLayers(False)
 	.push(wabot)
 	.build()