diff --git a/src/device/Device.java b/src/device/Device.java
index cbe8a12..4e6860e 100644
--- a/src/device/Device.java
+++ b/src/device/Device.java
@@ -29,11 +29,7 @@ import java.util.Vector;
 
 import logic.*;
 import event.*;
-import filter.DirectionalEquivalenceFilter;
-import filter.Filter;
-import filter.IdleStateFilter;
-import filter.MotionDetectFilter;
-import util.Log;
+import filter.*;
 
 public class Device {
 	
@@ -68,7 +64,6 @@ public class Device {
 	 */
 	public void addFilter(Filter filter) {
 		this.filters.add(filter);
-		Log.write("Filter added...");
 	}
 	
 	/**
@@ -89,7 +84,6 @@ public class Device {
 	 */
 	public void addDeviceListener(DeviceListener listener) {
 		this.devicelistener.add(listener);
-		Log.write("WiimoteListener added...");
 	}
 	
 	/**
@@ -99,7 +93,6 @@ public class Device {
 	 */
 	public void addGestureListener(GestureListener listener) {
 		this.processingunit.addGestureListener(listener);
-		Log.write("GestureListener added...");
 	}
 	
 	public int getRecognitionButton() {
diff --git a/src/device/Wiimote.java b/src/device/Wiimote.java
index 0fea970..38813bf 100755
--- a/src/device/Wiimote.java
+++ b/src/device/Wiimote.java
@@ -94,7 +94,7 @@ public class Wiimote extends Device {
 	 * 			String representation of the mac-adress e.g. 00191D68B57C
 	 */
 	public Wiimote(String btaddress) throws IOException {
-		btaddress = this.removeChar(btaddress, ':');
+        btaddress = this.removeChar(btaddress, ':');
 		this.btaddress=btaddress;
 		this.vibrating=false;
 		this.connect();
@@ -287,6 +287,7 @@ public class Wiimote extends Device {
 	 * nothing else would happen.
 	 * 
 	 */
+    @Override
 	public void enableAccelerationSensors() throws IOException {
 		super.enableAccelerationSensors();
 		if(!this.calibrated) {
@@ -301,6 +302,7 @@ public class Wiimote extends Device {
 	 * Deactivates the acceleration sensors.
 	 * 
 	 */
+    @Override
 	public void disableAccelerationSensors() throws IOException {
 		super.disableAccelerationSensors();
 		this.sendRaw(new byte[] {CMD_SET_REPORT, 0x12, 0x00, 0x30});
diff --git a/src/device/WiimoteStreamer.java b/src/device/WiimoteStreamer.java
index c382a97..43f4b5b 100755
--- a/src/device/WiimoteStreamer.java
+++ b/src/device/WiimoteStreamer.java
@@ -56,6 +56,7 @@ public class WiimoteStreamer extends Thread {
 		this.receiveCon = wiimote.getReceiveConnection();
 	}
 
+    @Override
 	public void run() {
 		this.running = true;
 		int xraw, yraw, zraw;
diff --git a/src/logic/HMM.java b/src/logic/HMM.java
index 0bfd6d3..f8fdfac 100755
--- a/src/logic/HMM.java
+++ b/src/logic/HMM.java
@@ -135,7 +135,6 @@ public class HMM {
 				double nenner=0;
 			
 				for(int k=0; k<trainsequence.size(); k++) {
-					//this.reset();
 					int[] sequence = trainsequence.elementAt(k);
 					
 					double[][] fwd = this.forwardProc(sequence);
@@ -165,7 +164,6 @@ public class HMM {
 				double nenner=0;
 			
 				for(int k=0; k<trainsequence.size(); k++) {
-					//this.reset();
 					int[] sequence = trainsequence.elementAt(k);
 					
 					double[][] fwd = this.forwardProc(sequence);