diff --git a/epydial/80epydial b/epydial/80epydial
index e95bb77..525735a 100755
--- a/epydial/80epydial
+++ b/epydial/80epydial
@@ -4,4 +4,4 @@ NAME=epydial
 PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH
 TZ=MET; export TZ
 cd /usr/share/$NAME
-exec python2.5 ./$NAME.py > /media/card/$NAME.log 2>&1
+exec python ./$NAME.py > /media/card/$NAME.log 2>&1
diff --git a/epydial/audio_screen.py b/epydial/audio_screen.py
index 4a9ace8..b300d72 100755
--- a/epydial/audio_screen.py
+++ b/epydial/audio_screen.py
@@ -87,7 +87,7 @@ class AudioScreen(EdjeGroup):
 
 	def on_get_mp3_tags(self, status):
 		PyneoController.get_song_duration()
-		PyneoController.get_song_position()
+#		PyneoController.get_song_position()
 		try:
 			self.image.delete()
 		except:
@@ -133,8 +133,6 @@ class AudioScreen(EdjeGroup):
 				PyneoController.get_mp3_tags()
 				self.toggle = 1
 			elif self.toggle == 1:
-				print '--- timer stoppen'
-				self.e_timer.delete()
 				self.signal_emit("key2", "")
 				PyneoController.pause_music()
 				self.toggle = 0
@@ -142,6 +140,7 @@ class AudioScreen(EdjeGroup):
 			self.signal_emit("key2", "")
 			self.toggle = 0
 			PyneoController.stop_music()
+			PyneoController.get_mp3_tags()
 		if source == "track_right":
 			PyneoController.next_music()
 		if source == "track_left":
diff --git a/epydial/dialer_screen.py b/epydial/dialer_screen.py
index 1fbd063..1124b95 100644
--- a/epydial/dialer_screen.py
+++ b/epydial/dialer_screen.py
@@ -27,14 +27,14 @@ class DialerScreen(EdjeGroup):
 #		PyneoController.register_callback("gsm_dialing", self.on_gsm_dialing)
 		PyneoController.register_callback("gsm_operator_change", self.on_gsm_operator_change)
 		PyneoController.register_callback("gsm_signal_strength_change", self.on_gsm_signal_strength_change)
-		PyneoController.register_callback("battvolt_change", self.on_battvolt_change)
+		PyneoController.register_callback("capacity_change", self.on_capacity_change)
 
-	def on_battvolt_change(self, battvolt, chgmode):
-		if chgmode == "play-only" or chgmode == "idle":
-			EdjeGroup.color_class_set(self, "battvolt_active", 255, 255, 255, 64, 0, 0, 0, 0, 0, 0, 0, 0)
-		else:
-			EdjeGroup.color_class_set(self, "battvolt_active", 255, 255, 255, 128, 0, 0, 0, 0, 0, 0, 0, 0)
-		self.part_text_set("battvolt_text", "%s V"%str(battvolt)[:4])
+	def on_capacity_change(self, status):
+#		if chgmode == "play-only" or chgmode == "idle":
+#			EdjeGroup.color_class_set(self, "battvolt_active", 255, 255, 255, 64, 0, 0, 0, 0, 0, 0, 0, 0)
+#		else:
+#			EdjeGroup.color_class_set(self, "battvolt_active", 255, 255, 255, 128, 0, 0, 0, 0, 0, 0, 0, 0)
+		self.part_text_set("battvolt_text", "%s" % status['capacity'])
 		
 	def on_sim_key_required(self, key_type):
 		print '---', 'opening keyring'
diff --git a/epydial/epydial.py b/epydial/epydial.py
index d98079d..49a1ac0 100755
--- a/epydial/epydial.py
+++ b/epydial/epydial.py
@@ -363,8 +363,8 @@ class PyneoController(object):
 	def on_pwr_status(class_, status_map):
 		status = dedbusmap(status_map)
 		print "POWER Status: " + str(status)
-		if status.has_key('battvolt'):
-			class_.notify_callbacks("battvolt_change", status['battvolt'], status['chgmode'])
+#		if status.has_key('battvolt'):
+		class_.notify_callbacks("capacity_change", status)
 		class_.notify_callbacks("pwr_status_change", status)
 
 	@classmethod
diff --git a/epydial/gsm_status_screen.py b/epydial/gsm_status_screen.py
index c4ae0ce..1b0611b 100644
--- a/epydial/gsm_status_screen.py
+++ b/epydial/gsm_status_screen.py
@@ -73,8 +73,4 @@ class GsmStatusScreen(EdjeGroup):
 			PyneoController.power_down_gsm()
 		elif source == "on" and status == "off":
 			PyneoController.power_up_gsm()
-#		elif source == "button_right_bg_brightness":
-#			PyneoController.brightness_change(source)
-#		elif source == "button_left_bg_brightness":
-#			PyneoController.brightness_change(source)
-
+		print 'source: ', source