diff --git a/config/keyboard/test.conf b/config/keyboard/test.conf
index f2c6f50d..d3d32945 100644
--- a/config/keyboard/test.conf
+++ b/config/keyboard/test.conf
@@ -26,10 +26,10 @@ KEY_FENRIR,KEY_KPDOT=exit_review
 #KEY_FENRIR,KEY_KP5=curr_screen
 KEY_FENRIR,KEY_KP8=curr_screen_before_cursor
 KEY_FENRIR,KEY_KP2=curr_screen_after_cursor
-#KEY_FENRIR,KEY_1=set_window_application
-#KEY_FENRIR,KEY_3=clear_window_application
-KEY_FENRIR,KEY_3=clear_bookmark_1
-KEY_FENRIR,KEY_1=set_bookmark_1
+KEY_FENRIR,KEY_1=set_window_application
+KEY_FENRIR,KEY_3=clear_window_application
+#KEY_FENRIR,KEY_3=clear_bookmark_1
+#KEY_FENRIR,KEY_1=set_bookmark_1
 KEY_FENRIR,KEY_2=bookmark_1
 KEY_KPPLUS=last_incoming
 KEY_FENRIR,KEY_F2=toggle_braille
diff --git a/config/settings/settings.conf b/config/settings/settings.conf
index ce851095..5934063c 100644
--- a/config/settings/settings.conf
+++ b/config/settings/settings.conf
@@ -57,7 +57,7 @@ module=espeak
 voice=
 
 # Select the language you want fenrir to use.
-language=de
+language=english-us
 
 # Read new text as it happens?
 autoReadIncoming=True
@@ -82,7 +82,7 @@ device=AUTO
 grabDevices=True
 ignoreShortcuts=False
 # the current shortcut layout located in /etc/fenrir/keyboard
-keyboardLayout=test
+keyboardLayout=desktop
 # echo chars while typing.
 charEcho=False
 # echo deleted chars
@@ -95,7 +95,7 @@ interruptOnKeyPress=False
 doubleTapDelay=0.2
 
 [general]
-debugLevel=0
+debugLevel=3
 punctuationLevel=Some
 numberOfClipboards=10
 # define the current fenrir key
diff --git a/src/fenrir-package/core/cursorManager.py b/src/fenrir-package/core/cursorManager.py
index 897389a9..30ccb21c 100644
--- a/src/fenrir-package/core/cursorManager.py
+++ b/src/fenrir-package/core/cursorManager.py
@@ -57,9 +57,11 @@ class cursorManager():
     def isApplicationWindowSet(self):
         try:
             currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-            return self.env['commandBuffer']['windowArea'][currApp]['1'] != None
+            if self.env['commandBuffer']['windowArea'][currApp]['1'] != None:
+                return True
         except:
-            return False
+            pass
+        return False
     def setWindowForApplication(self):
         if not self.env['commandBuffer']['Marks']['1']:
             return False
diff --git a/src/fenrir-package/core/screenManager.py b/src/fenrir-package/core/screenManager.py
index 6cd09207..d03f193f 100644
--- a/src/fenrir-package/core/screenManager.py
+++ b/src/fenrir-package/core/screenManager.py
@@ -43,8 +43,10 @@ class screenManager():
             return text
         windowText = ''
         windowList = text.split('\n')
-        windowList = windowList[self.env['commandBuffer']['windowArea'][self.env['screenData']['newApplication']]['1']['y']:self.env['commandBuffer']['windowArea'][currApp]['2']['y'] + 1]
+        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
+        windowList = windowList[self.env['commandBuffer']['windowArea'][currApp]['1']['y']:self.env['commandBuffer']['windowArea'][currApp]['2']['y'] + 1]
         for line in windowList:
-            windowText += line[self.env['commandBuffer']['windowArea'][self.env['screenData']['newApplication']]['1']['x']:self.env['commandBuffer']['windowArea'][currApp]['2']['x'] + 1] + '\n'
+            windowText += line[self.env['commandBuffer']['windowArea'][currApp]['1']['x']:self.env['commandBuffer']['windowArea'][currApp]['2']['x'] + 1] + '\n'
+        print(windowText)
         return windowText
 
diff --git a/src/fenrir-package/fenrir.py b/src/fenrir-package/fenrir.py
index 7c41ba97..606b66d7 100755
--- a/src/fenrir-package/fenrir.py
+++ b/src/fenrir-package/fenrir.py
@@ -64,8 +64,7 @@ class fenrir():
             self.environment['runtime']['commandManager'].executeDefaultTrigger('onScreenUpdate')         
             
         self.handleCommands()
-        #print(time.time()-startTime)   
-        self.env['screenData']['oldApplication'] = self.env['screenData']['newApplication']             
+        #print(time.time()-startTime)       
 
     def prepareCommand(self):
         if self.environment['runtime']['screenManager'].isSuspendingScreen():