diff --git a/.codeclimate.yml b/.codeclimate.yml
index 210a7b7..260ff71 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -39,3 +39,6 @@ checks:
   identical-code:
     config:
       threshold: # language-specific defaults. an override will affect all languages.
+
+exclude_patterns:
+  - "**/node_modules/"
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..78cecd6
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,22 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+end_of_line = lf
+charset = utf-8
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+insert_final_newline = false
+
+[{,test/}{actual,fixtures}/**]
+trim_trailing_whitespace = false
+insert_final_newline = false
+
+[templates/**]
+trim_trailing_whitespace = false
+insert_final_newline = false
diff --git a/src/.eslintrc.yml b/src/.eslintrc.yml
index 14520e7..a03ec4c 100755
--- a/src/.eslintrc.yml
+++ b/src/.eslintrc.yml
@@ -2,6 +2,7 @@ parserOptions:
   ecmaVersion: 2020
 env:
   node: true
+  es6: true
 extends: 'eslint:recommended'
 rules:
   indent:
@@ -23,6 +24,3 @@ rules:
     - warn
   no-unused-vars:
     - warn
-    
-
-    
\ No newline at end of file
diff --git a/src/lib/sessionmetrics.js b/src/lib/sessionmetrics.js
index 5a12d99..51201aa 100755
--- a/src/lib/sessionmetrics.js
+++ b/src/lib/sessionmetrics.js
@@ -60,8 +60,8 @@ function getSessionStatsFromSense(host, virtualProxy, influxTags) {
 
     var options = {};
 
-    options.Certificate = path.resolve(__dirname, globals.config.get('Butler-SOS.cert.clientCert'))
-    options.CertificateKey = path.resolve(__dirname, globals.config.get('Butler-SOS.cert.clientCertKey'))
+    options.Certificate = path.resolve(__dirname, globals.config.get('Butler-SOS.cert.clientCert'));
+    options.CertificateKey = path.resolve(__dirname, globals.config.get('Butler-SOS.cert.clientCertKey'));
     options.CertificateCA = path.resolve(__dirname, globals.config.get('Butler-SOS.cert.clientCertCA'));
 
 
diff --git a/src/lib/telemetry.js b/src/lib/telemetry.js
index 625cc63..5579487 100644
--- a/src/lib/telemetry.js
+++ b/src/lib/telemetry.js
@@ -32,7 +32,7 @@ var callRemoteURL = async function () {
                     dockerHealthCheck: globals.config.has('Butler-SOS.dockerHealthCheck.enabled') ? globals.config.get('Butler-SOS.dockerHealthCheck.enabled') : false,
                     uptimeMonitor: globals.config.has('Butler-SOS.uptimeMonitor.enabled') ? globals.config.get('Butler-SOS.uptimeMonitor.enabled') : false,
                     uptimeMonitor_storeInInfluxdb: globals.config.has('Butler-SOS.uptimeMonitor.storeInInfluxdb.butlerSOSMemoryUsage') ? globals.config.get('Butler-SOS.uptimeMonitor.storeInInfluxdb.butlerSOSMemoryUsage') : false,
-                    udpServer: globals.config.has('Butler-SOS.udpServerConfig.enable') ? globals.config.get('Butler-SOS.udpServerConfig.enable') : false,
+                    udpServer: globals.config.has('Butler-SOS.userEvents.enable') ? globals.config.get('Butler-SOS.userEvents.enable') : false,
                     logdb: globals.config.has('Butler-SOS.logdb.enableLogDb') ? globals.config.get('Butler-SOS.logdb.enableLogDb') : false,
                     mqtt: globals.config.has('Butler-SOS.mqttConfig.enableMQTT') ? globals.config.get('Butler-SOS.mqttConfig.enableMQTT') : false,
                     influxdb: globals.config.has('Butler-SOS.influxdbConfig.enableInfluxdb') ? globals.config.get('Butler-SOS.influxdbConfig.enableInfluxdb') : false,