diff --git a/src/control/GameControl.java b/src/control/GameControl.java
index 1c5b7ae..3afd855 100644
--- a/src/control/GameControl.java
+++ b/src/control/GameControl.java
@@ -20,18 +20,17 @@ public class GameControl implements JoystickListener, ButtonListener{
 
 	@Override
 	public void buttonPressed(ButtonEvent e) {
-		view.setColor(e.getButton().getColor());
+		if(e.getButton().getButtonID()>0)
+		{
+			view.setColor(e.getButton().getColor());
+		}
 	}
 
 	@Override
-	public void buttonReleased(ButtonEvent e) {
-		// TODO Auto-generated method stub
-		
-	}
+	public void buttonReleased(ButtonEvent e) {}
 
 	@Override
-	public void onJoyStickMoved(JoystickEvent e) {
-		// TODO Auto-generated method stub
-		
+	public void onJoystickMoved(JoystickEvent e) {
+		view.setString(e.getJoystick().getPos().name());
 	}
 }
diff --git a/src/control/LedHandler.java b/src/control/LedHandler.java
index 650a23d..eb16234 100644
--- a/src/control/LedHandler.java
+++ b/src/control/LedHandler.java
@@ -49,10 +49,8 @@ public class LedHandler {
      * Remember: Button leds are GRB, normal ledstrip is RGB
      */
     public void setLed(int led, int r, int g, int b) {
-	    if(led==-1)
-	    {
+	    if(led<0)
 	    	return;
-	    }
     	try {
     		System.out.println("Set the led with " + r);
 	        out.write( "1|" + led + "|" + r + "|" + g + "|" + b + "\n" );