diff --git a/src/fenrir-package/commands/command_template.py b/src/fenrir-package/commands/command_template.py
index ca2a1c84..8b97e071 100644
--- a/src/fenrir-package/commands/command_template.py
+++ b/src/fenrir-package/commands/command_template.py
@@ -1,15 +1,16 @@
 #!/bin/python
+from utils import debug
 
 class command():
     def __init__(self):
         pass
     def initialize(self, environment):
-        return environment
+        pass
     def shutdown(self, environment):
-        return environment 
+        pass
     def getDescription(self, environment):
         return 'No Description found'         
     def run(self, environment):
-        return environment
+        pass
     def setCallback(self, callback):
         pass
diff --git a/src/fenrir-package/core/screenManager.py b/src/fenrir-package/core/screenManager.py
index 74b548af..833b1a98 100644
--- a/src/fenrir-package/core/screenManager.py
+++ b/src/fenrir-package/core/screenManager.py
@@ -19,7 +19,6 @@ class screenManager():
         return environment
 
     def update(self, environment):
-        print(self.isSuspendingScreen(environment))
         if not self.isSuspendingScreen(environment):
             environment = environment['runtime']['screenDriver'].update(environment)
             environment['screenData']['lastScreenUpdate'] = time.time()
diff --git a/src/fenrir-package/core/settingsManager.py b/src/fenrir-package/core/settingsManager.py
index 11dfb325..3bd052fd 100644
--- a/src/fenrir-package/core/settingsManager.py
+++ b/src/fenrir-package/core/settingsManager.py
@@ -1,5 +1,5 @@
 #!/bin/python
-import evdev
+
 import importlib.util
 import os
 from configparser import ConfigParser
@@ -30,7 +30,7 @@ class settingsManager():
             if line.count("=") != 1:
                 continue
             sepLine = line.split('=')
-            commandName = sepLine[1]
+            commandName = sepLine[1].upper()
             sepLine[0] = sepLine[0].replace(" ","")
             sepLine[0] = sepLine[0].replace("'","")
             sepLine[0] = sepLine[0].replace('"',"")
@@ -49,13 +49,6 @@ class settingsManager():
             environment['bindings'][str(shortcut)] = commandName     
         kbConfig.close()
 
-
-    def getCodeForKeyID(self, keyID):
-        try:
-            return evdev.ecodes.ecodes[keyID.upper()]
-        except:
-            return 0
-
     def loadSoundIcons(self, environment, soundIconPath):
         siConfig = open(soundIconPath + '/soundicons.conf',"r")
         while(True):
diff --git a/src/fenrir-package/fenrir.py b/src/fenrir-package/fenrir.py
index 1f400abf..0738dab4 100755
--- a/src/fenrir-package/fenrir.py
+++ b/src/fenrir-package/fenrir.py
@@ -33,9 +33,8 @@ class fenrir():
         self.shutdown()
 
     def handleProcess(self):
-        time.sleep(3)
         timeout = self.environment['runtime']['inputManager'].proceedInputEvent(self.environment)
-        timeout = False
+        timeout = True
         try:
             self.environment['runtime']['screenManager'].update(self.environment)
         except Exception as e:
@@ -45,7 +44,8 @@ class fenrir():
             #currShortcut = self.environment['runtime']['inputManager'].getCurrShortcut(self.environment)        
             shortcut = "[1, ['KEY_FENRIR', 'KEY_T']]"
             command = self.environment['runtime']['inputManager'].getCommandForShortcut(self.environment, shortcut)        
-            self.environment['runtime']['commandManager'].queueCommand(self.environment, command)        
+            print(command)
+            #self.environment['runtime']['commandManager'].queueCommand(self.environment, command)        
         if not timeout:
             self.environment['runtime']['commandManager'].executeTriggerCommands(self.environment, 'onInput')            
         self.environment['runtime']['commandManager'].executeTriggerCommands(self.environment, 'onScreenChanged')        
diff --git a/src/fenrir-package/inputDriver/evdev.py b/src/fenrir-package/inputDriver/evdev.py
index 17523e90..f9204ced 100644
--- a/src/fenrir-package/inputDriver/evdev.py
+++ b/src/fenrir-package/inputDriver/evdev.py
@@ -18,7 +18,6 @@ class driver():
     def getInput(self, environment):
         event = None
         r, w, x = select(self.iDevices, [], [], environment['runtime']['settingsManager'].getSettingAsFloat(environment, 'screen', 'screenUpdateDelay'))
-        print(len(list(r)))
         if r != []:
             for fd in r:
                 event = self.iDevices[fd].read_one()
@@ -33,6 +32,12 @@ class driver():
         self.iDevices = map(evdev.InputDevice, (evdev.list_devices()))
         self.iDevices = {dev.fd: dev for dev in self.iDevices if 1 in dev.capabilities()}
 
+    def mapEvent(self, event):
+        try:
+            return evdev.ecodes.ecodes[keyID.upper()]
+        except:
+            return 0
+            
     def grabDevices(self):
         for fd in self.iDevices:
             dev = self.iDevices[fd]