diff --git a/consumer.js b/consumer.js
index 6d8c09e..0f71a56 100644
--- a/consumer.js
+++ b/consumer.js
@@ -1,5 +1,6 @@
 import config from "./config";
 import pubSub from 'pubsub-js';
+import logger from './logger';
 
 export default class Consumer {
 
@@ -10,6 +11,7 @@ export default class Consumer {
 
         this.reports = config.reports.map(report =>
             new report.class(report.channels, config, pubSub));
+
     };
 
     dispatch = (data) => {
@@ -18,8 +20,8 @@ export default class Consumer {
             switch (message.type) {
                 case "ris_message": this.handleUpdate(message)
             }
-        } catch (e) {
-            console.log(e);
+        } catch (error) {
+            // Don't do anything
         }
     };
 
@@ -33,9 +35,10 @@ export default class Consumer {
                 // Promise call to reduce waiting times
                 monitor.monitor(message)
                     .catch(error => {
-
-                        // Log error properly
-                        console.log(error);
+                        logger.log({
+                            level: 'error',
+                            message: error
+                        });
                     });
             }
         }
diff --git a/index.js b/index.js
index 143d2e4..1700ed4 100644
--- a/index.js
+++ b/index.js
@@ -4,7 +4,7 @@ import WebSocket from "ws";
 import sleep from "sleep";
 import Consumer from "./consumer";
 import InputManager from "./inputManager";
-
+import logger from './logger';
 
 const inputManager = new InputManager(config);
 
@@ -57,7 +57,10 @@ if (cluster.isMaster) {
         });
 
         ws.on('close', function close() {
-            console.log('Disconnected');
+            logger.log({
+                level: 'info',
+                message: 'Web socket disconnected'
+            });
         });
     }
 
diff --git a/logger.js b/logger.js
index 20a695b..b11d620 100644
--- a/logger.js
+++ b/logger.js
@@ -4,8 +4,8 @@ const logger = winston.createLogger({
     level: 'info',
     format: winston.format.json(),
     transports: [
-        new winston.transports.File({ filename: 'error.log', level: 'error' }),
-        new winston.transports.File({ filename: 'reports.log' })
+        new winston.transports.File({ filename: 'logs/error.log', level: 'error' }),
+        new winston.transports.File({ filename: 'logs/reports.log' })
     ]
 });
 
diff --git a/monitors/monitor.js b/monitors/monitor.js
index d2fd74d..06245cd 100644
--- a/monitors/monitor.js
+++ b/monitors/monitor.js
@@ -1,3 +1,4 @@
+import logger from '../logger';
 
 export default class Monitor {
 
@@ -131,6 +132,11 @@ export default class Monitor {
 
         this.pubSub.publish(this.channel, alert);
 
+        logger.log({
+            level: 'verbose',
+            message: alert.message
+        });
+
         return alert;
     }
 
diff --git a/package.json b/package.json
index 44925fb..5510719 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "event-stream": "^4.0.1",
-    "ip": "^1.1.5",
+    "ip": "https://github.com/MaxCam/node-ip.git#contains-prefix",
     "ip-address": "^5.9.2",
     "ip2buf": "^2.0.0",
     "js-yaml": "^3.13.1",
diff --git a/reports/reportEmail.js b/reports/reportEmail.js
index 68d8932..b5b3170 100644
--- a/reports/reportEmail.js
+++ b/reports/reportEmail.js
@@ -1,5 +1,7 @@
 import Report from "./report";
 import nodemailer from "nodemailer";
+import logger from '../logger';
+
 
 export default class ReportEmail extends Report {
 
@@ -30,7 +32,10 @@ export default class ReportEmail extends Report {
                     text: "Hello world?"
                 })
                 .catch(error => {
-                    console.log("log the error properly!", error);
+                    logger.log({
+                        level: 'error',
+                        message: error
+                    });
                 })
         }
     }
diff --git a/yarn.lock b/yarn.lock
index 8bda7a0..066e62b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1569,6 +1569,10 @@ ip@^1.1.5:
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
   integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
+"ip@https://github.com/MaxCam/node-ip.git#contains-prefix":
+  version "1.1.5"
+  resolved "https://github.com/MaxCam/node-ip.git#f088d6611315deb914619c2c12f49f35cae4d0d5"
+
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"