diff --git a/java/src/mimis/GUI.java b/java/src/mimis/GUI.java
index deee861..1395db6 100644
--- a/java/src/mimis/GUI.java
+++ b/java/src/mimis/GUI.java
@@ -53,7 +53,7 @@ public class GUI extends JFrame {
             JPanel applicationPanel = createManagerPanel(applicationManager, APPLICATION_TITLE);
             controlPanel.add(applicationPanel);
         }
-        if (applicationManager.count() > 0) {
+        if (deviceManager.count() > 0) {
             JPanel devicePanel = createManagerPanel(deviceManager, DEVICE_TITLE);
             controlPanel.add(devicePanel);
         }
@@ -80,7 +80,6 @@ public class GUI extends JFrame {
     protected void processWindowEvent(WindowEvent event) {
         if (event.getID() == WindowEvent.WINDOW_CLOSING) {
             log.debug("Window closing");
-            stop();
             try {
                 mimis.stop();
             } catch (DeactivateException e) {
diff --git a/java/src/mimis/Worker.java b/java/src/mimis/Worker.java
index d9d8fe3..c4e1516 100644
--- a/java/src/mimis/Worker.java
+++ b/java/src/mimis/Worker.java
@@ -12,11 +12,11 @@ public abstract class Worker implements Runnable {
     protected static final boolean THREAD = true;
     protected static final int SLEEP = 100;
 
-    protected boolean running = false;
+    protected boolean run = false;
     protected boolean active = false;
 
     public void start(boolean thread) {
-        running = true;
+        run = true;
         if (thread) {
             log.debug("Start thread");
             new Thread(this, getClass().getName()).start();
@@ -32,9 +32,11 @@ public abstract class Worker implements Runnable {
 
     public void stop() throws DeactivateException {
         if (active()) {
+            log.debug("stop deact");
             deactivate();
+            log.debug("stop na deact");
         }
-        running = false;
+        run = false;
         synchronized (this) {
             notifyAll();
         }
@@ -64,7 +66,7 @@ public abstract class Worker implements Runnable {
 
     public void activate(boolean thread) {
         active = true;
-        if (!running) {
+        if (!run) {
             start(thread);
         }
         synchronized (this) {
@@ -80,7 +82,7 @@ public abstract class Worker implements Runnable {
     }
 
     public final void run() {
-        while (running) {
+        while (run) {
             if (active()) {
                 work();
             } else {
diff --git a/java/src/mimis/application/cmd/CMDApplication.java b/java/src/mimis/application/cmd/CMDApplication.java
index cb1e4ea..c201ea7 100644
--- a/java/src/mimis/application/cmd/CMDApplication.java
+++ b/java/src/mimis/application/cmd/CMDApplication.java
@@ -10,7 +10,7 @@ import mimis.util.VBScript;
 
 
 public abstract class CMDApplication extends Application {
-    protected final static String REGISTRY = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths";
+    protected final static String REGISTRY = "HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths";
 
     protected String program;
     protected String title;
diff --git a/java/src/mimis/application/vlc/VLCApplication.java b/java/src/mimis/application/vlc/VLCApplication.java
index 395bc39..8798454 100644
--- a/java/src/mimis/application/vlc/VLCApplication.java
+++ b/java/src/mimis/application/vlc/VLCApplication.java
@@ -16,7 +16,7 @@ import mimis.value.Action;
 import mimis.value.Amount;
 
 public class VLCApplication extends CMDApplication {
-    protected final static String REGISTRY = "HKEY_CLASSES_ROOT\\Applications\\vlc.exe\\shell\\Open\\command";
+    protected final static String REGISTRY = "HKCR\\Applications\\vlc.exe\\shell\\Open\\command";
     protected final static String PROGRAM = "vlc.exe";
     protected final static String TITLE = "VLC media player";
 
diff --git a/java/src/mimis/device/lirc/LircDevice.java b/java/src/mimis/device/lirc/LircDevice.java
index 2861ee9..36dfdfd 100644
--- a/java/src/mimis/device/lirc/LircDevice.java
+++ b/java/src/mimis/device/lirc/LircDevice.java
@@ -41,7 +41,6 @@ public class LircDevice extends Device implements LircButtonListener, SignalList
     }
 
     public void activate() throws ActivateException {
-        multiplexer.start();
         lircService.activate();
         add(eventMapCycle.denonRC176);
         add(eventMapCycle.philiphsRCLE011);
@@ -52,7 +51,11 @@ public class LircDevice extends Device implements LircButtonListener, SignalList
     public boolean active() {
         log.trace("LircDevice active?");
         if (active && !lircService.active()) {
-            active = false;
+            try {
+                deactivate();
+            } catch (DeactivateException e) {
+                log.error(e);
+            }
         } else if (!active) {
             try {
                 if (VBScript.isRunning(PROGRAM)) {
@@ -72,8 +75,9 @@ public class LircDevice extends Device implements LircButtonListener, SignalList
     public void deactivate() throws DeactivateException {
         log.debug("Deactivate LircDevice");
         super.deactivate();
-        multiplexer.stop();
+        log.debug("nu lircserv");
         lircService.deactivate();
+        log.debug("nu erna");
     }
 
     public void add(LircButton lircButton) {
@@ -92,8 +96,9 @@ public class LircDevice extends Device implements LircButtonListener, SignalList
     }
 
     public void stop() throws DeactivateException {
-        multiplexer.stop();
-        lircService.stop();
+        log.debug("Stop LircDevice");
         super.stop();
+        lircService.stop();
+        multiplexer.stop();
     }
 }
diff --git a/java/src/mimis/device/lirc/LircService.java b/java/src/mimis/device/lirc/LircService.java
index 8ad9db0..d732f30 100644
--- a/java/src/mimis/device/lirc/LircService.java
+++ b/java/src/mimis/device/lirc/LircService.java
@@ -37,7 +37,7 @@ public class LircService extends Worker {
 
     public LircService(HashMap<String, LircButton[]> buttonMap) {
         this(buttonMap, IP, PORT);
-        send = Native.getValue("HKEY_CURRENT_USER\\Software\\LIRC", "password");
+        send = Native.getValue("HKCU\\Software\\LIRC", "password");
     }
 
     public LircService(HashMap<String, LircButton[]> buttonMap, String ip, int port) {
@@ -56,6 +56,7 @@ public class LircService extends Worker {
     }
 
     public void activate() throws ActivateException {
+        log.debug("Activate LircService");
         try {
             socket = new Socket(ip, port);
 
@@ -75,16 +76,18 @@ public class LircService extends Worker {
     }
 
     public boolean active() {
+        log.trace("LircService active?");
         if (active && !socket.isConnected()) {
             active = false;
         }
+        log.trace(active);
         return active;
     }
 
     public void deactivate() throws DeactivateException {
+        log.debug("Deactivate LircService");
         super.deactivate();
         try {
-            bufferedReader.close();
             inputStream.close();
             outputStream.close();
             socket.close();
diff --git a/java/src/mimis/event/EventListener.java b/java/src/mimis/event/EventListener.java
index 8f6d60e..c7e98cc 100644
--- a/java/src/mimis/event/EventListener.java
+++ b/java/src/mimis/event/EventListener.java
@@ -29,7 +29,7 @@ public abstract class EventListener extends Worker {
                 try {
                     work.wait();
                 } catch (InterruptedException e) {}
-                if (!running) {
+                if (!run) {
                     return;
                 }
             }
diff --git a/java/src/mimis/todo/TODO b/java/src/mimis/todo/TODO
index 7662149..9a3abf2 100644
--- a/java/src/mimis/todo/TODO
+++ b/java/src/mimis/todo/TODO
@@ -6,10 +6,4 @@ feedback?
 
 mogelijkheid tot webstart onderzoeken
 
-
-IN PROGRESS
--------------
-
-exporteren naar uitvoerbare jar file
-
-favicon maken?
\ No newline at end of file
+exporteren naar uitvoerbare jar file
\ No newline at end of file
diff --git a/java/src/mimis/util/Multiplexer.java b/java/src/mimis/util/Multiplexer.java
index 5cd92ed..9840b04 100644
--- a/java/src/mimis/util/Multiplexer.java
+++ b/java/src/mimis/util/Multiplexer.java
@@ -47,6 +47,7 @@ public class Multiplexer extends Worker {
     }
 
     protected void work() {
+        log.debug("Multiplexer work");
         try {
             synchronized (this) {
                 wait(TIMEOUT);