diff --git a/python_apps/media-monitor2/media/monitor/eventdrainer.py b/python_apps/media-monitor2/media/monitor/eventdrainer.py
index 69f997bf0..1d3bc96f6 100644
--- a/python_apps/media-monitor2/media/monitor/eventdrainer.py
+++ b/python_apps/media-monitor2/media/monitor/eventdrainer.py
@@ -9,6 +9,7 @@ class EventDrainer(Loggable):
     """
     def __init__(self, connection, interval=1):
         def cb():
+            # TODO : make 0.3 parameter configurable
             try                   : connection.drain_events(timeout=0.3)
             except socket.timeout : pass
             except Exception as e :
diff --git a/python_apps/media-monitor2/media/monitor/metadata.py b/python_apps/media-monitor2/media/monitor/metadata.py
index c42c54587..195d7fcdd 100644
--- a/python_apps/media-monitor2/media/monitor/metadata.py
+++ b/python_apps/media-monitor2/media/monitor/metadata.py
@@ -163,9 +163,12 @@ class Metadata(Loggable):
         # Forcing the unicode through
         try    : fpath = fpath.decode("utf-8")
         except : pass
+
         if not mmp.file_playable(fpath): raise BadSongFile(fpath)
+
         try              : full_mutagen  = mutagen.File(fpath, easy=True)
         except Exception : raise BadSongFile(fpath)
+
         self.path = fpath
         if not os.path.exists(self.path):
             self.logger.info("Attempting to read metadata of file \