diff --git a/src/API.py b/src/API.py
index 6fe5d2f..f3c1d54 100644
--- a/src/API.py
+++ b/src/API.py
@@ -144,11 +144,11 @@ class Buffer(object):
 
     def update_buffer(self):
         #ToDo
-        None
+        pass
 
     def init_buffer(self):
         #ToDo
-        None
+        pass
 
 class API(object):
 
diff --git a/src/CANFilter.py b/src/CANFilter.py
index b8bc790..9600ac7 100644
--- a/src/CANFilter.py
+++ b/src/CANFilter.py
@@ -33,7 +33,7 @@ class CANFilter(Thread):
 
         self.queue = Queue()
 
-        self.pcan = PcanAdapter(PcanAdapter.Baudrate[self.conf['can_baud']],
+        self.pcan = PcanAdapter(PcanAdapter.Baudrate[self.conf['can_baudrate']],
                                 debug = self.conf['config_debug'])
         self.pcan.initialize()
 
@@ -70,8 +70,8 @@ class CANFilter(Thread):
         self.pcan.Messages['dc_pv'].addSignal( current )
         self.pcan.Messages['dc_pv'].addSignal( voltage )
 
-        self.pcan.Messages['dc_charging'].addSignal( current )
-        self.pcan.Messages['dc_charging'].addSignal( voltage )
+        self.pcan.Messages['dc_charger'].addSignal( current )
+        self.pcan.Messages['dc_charger'].addSignal( voltage )
 
     def mean(self, l):
         return float(sum(l))/len(l) if len(l) > 0 else 0
diff --git a/src/config.py b/src/config.py
index 0f0390c..f84caab 100644
--- a/src/config.py
+++ b/src/config.py
@@ -3,6 +3,9 @@ Created on 21.11.2013
 
 @author: rauchp
 '''
+from sys import stderr
+config = "config\ems.conf"
+
 class Config():
     _instance = None
 
diff --git a/src/config/ems.conf b/src/config/ems.conf
index 5d9312e..46661c6 100644
--- a/src/config/ems.conf
+++ b/src/config/ems.conf
@@ -1,5 +1,4 @@
 #### DATENBANK ####
-
 mySQL_server	= localhost
 mySQL_port		= 3306			# default 3306
 mySQL_user		= smoke
@@ -9,31 +8,28 @@ mySQL_table		= battery, grid, pv, charger
 mySQL_speed		= 0.1			# time between two query's in sec
 
 #### FLASK ####
-
 flask_server	= 0.0.0.0		# 0.0.0.0 for public access
 flask_port		= 5000
 flask_debug		= True
 
 #### CONFIG ####
-
 config_debug	= True
 
 #### CAN ####
-
 #possible Baud Rates: 100k, 125k, 250k, 500k, 1000k
-can_baud 	 	= 250k
+can_baudrate 	 	= 250k
 
 #can_messages 	= dc_battery, dc_grid, dc_pv, dc_charger
-#'dc_battery 	= id:0x3A4, length:8, time:50
-#'dc_grid 		= id:0x3A5, length:8, time:50
-#'dc_pv 		= id:0x3A6, length:8, time:50
-#'dc_charger 	= id:0x3A7, length:8, time:50
-
+#'dc_battery 	= id:0x3A4,  length:8,  time:50
+#'dc_grid 		= id:0x3A5,  length:8,  time:50
+#'dc_pv 			= id:0x3A6,  length:8,  time:50
+#'dc_charger 	= id:0x3A7,  length:8,  time:50
+#
 #can_signales 	= current, voltage, capacity, isMaster, isFeed, isCharging, isOn
-#'current 		= begin:0, length:16, offset:0, scaling:0.001, data:0
-#'voltage 		= begin:16, length:16, offset:0, scaling:0.01, data:0
-#'capacity 		= begin:32, length:11, offset:0, scaling:0.05, data:0
-#'isMaster 		= begin:56, length:1, offset:0, scaling:1, data:0
-#'isFeed 		= begin:57, length:1, offset:0, scaling:1, data:0
-#'isCharging 	= begin:57, length:1, offset:0, scaling:1, data:0
-#'isOn 			= begin:58, length:1, offset:0, scaling:1, data:0
+#'current 		= begin:0,   length:16,  offset:0,  scaling:0.001,  data:0
+#'voltage 		= begin:16,  length:16,  offset:0,  scaling:0.01,   data:0
+#'capacity 		= begin:32,  length:11,  offset:0,  scaling:0.05,   data:0
+#'isMaster 		= begin:56,  length:1,   offset:0,  scaling:1,      data:0
+#'isFeed 		= begin:57,  length:1,   offset:0,  scaling:1,      data:0
+#'isCharging 	= begin:57,  length:1,   offset:0,  scaling:1,      data:0
+#'isOn 			= begin:58,  length:1,   offset:0,  scaling:1,      data:0
diff --git a/src/ems.py b/src/ems.py
index 11737c3..b386257 100644
--- a/src/ems.py
+++ b/src/ems.py
@@ -4,9 +4,9 @@ Created on 15.11.2013
 @author: Philipp Rauch
 @version: 0.02
 '''
-
+from sys        import stderr
 from threading  import Thread
-from switch      import Switch, MYSQL
+from switch     import Switch, MYSQL
 from config     import Config
 
 ### LOAD CONFIG ###
@@ -62,13 +62,13 @@ class ems(Thread):
 
         ## Test of valid push message ##
         if not isinstance(push, dict):
-            print 'error wrong parameter: Type', push.__class__.__name__, 'expect Type dict'
+            stderr.write('error wrong parameter: Type is %s expect dict' % push.__class__.__name__)
             return
         if len(push.keys()) not in [1]:
-            print 'error wrong number of arguments:', len(push.keys()), 'expect 1'
+            stderr.write('error wrong number of arguments: %s expect 1' % len(push.keys()))
             return
         if not isinstance(push.get(push.keys()[0]) ,dict):
-            print 'error value is not dict'
+            stderr.write('error value is not dict')
             return
 
         key = push.keys()[0]
@@ -82,11 +82,10 @@ class ems(Thread):
             try:
                 sys = sys[key]
             except KeyError:
-                print 'error wrong path'
+                stderr.write('error wrong path: %s' % key)
                 return
 
         sys.update(value)
-        pass
 
     def getRequest(self):
         #TODO: get Request from buffer
diff --git a/src/test.py b/src/test.py
index 5e2df0c..653e74e 100644
--- a/src/test.py
+++ b/src/test.py
@@ -15,11 +15,12 @@ conf = c.readConf()
 
 
 ### CAN test ###
-print 'starte CAN mit Baud von', conf['can_baud']
+print 'starte CAN mit Baud von', conf['can_baudrate']
 can = CANFilter.CANFilter()
 can.start()
 
-### EMS test ###
+### EMS test ###9
+
 # buffer = {}
 # print 'starte EMS'
 # th = ems.ems(buffer)