diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
index f2f866994..6a0b1cdcb 100644
--- a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
+++ b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
@@ -102,6 +102,8 @@ class AirtimeMetadata:
 
     def get_md_from_file(self, filepath):
 
+        self.logger.info("getting info from filepath %s", filepath)
+
         md = {}
         md5 = self.get_md5(filepath)
         md['MDATA_KEY_MD5'] = md5
diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py
index e1121ef37..c8607b1a9 100644
--- a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py
+++ b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py
@@ -74,7 +74,15 @@ class AirtimeNotifier(Notifier):
             mm.wm.rm_watch(wd, rec=True)
 
             mm.set_needed_file_permissions(new_storage_directory, True)
-            mm.move_file(storage_directory, new_storage_directory)
+
+            #move everything in old stor directory to the new stor directory.
+            old_storage_contents = os.listdir(storage_directory)
+            for item in old_storage_contents:
+                fp = "%s/%s" % (storage_directory, item)
+                nfp = "%s/%s" % (new_storage_directory, item)
+                self.logger.info("Moving %s to %s", fp, nfp)
+                mm.move_file(fp, nfp)
+
             self.config.storage_directory = new_storage_directory
 
             mm.watch_directory(new_storage_directory)
diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
index 6d2ae0e6c..424b50ada 100644
--- a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
+++ b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
@@ -167,12 +167,12 @@ class AirtimeProcessEvent(ProcessEvent):
                     else:
                         md[m] = orig_md[m]
 
-            #make sure all track numbers are at least 2 digits long in the filepath.
-            if len(str(md['MDATA_KEY_TRACKNUMBER'])) == 1:
-                md['MDATA_KEY_TRACKNUMBER'] = "0"+str(md['MDATA_KEY_TRACKNUMBER'])
+            if 'MDATA_KEY_TRACKNUMBER' in orig_md:
+                #make sure all track numbers are at least 2 digits long in the filepath.
+                md['MDATA_KEY_TRACKNUMBER'] = "%02d" % (int(md['MDATA_KEY_TRACKNUMBER']))
 
             #format bitrate as 128kbps
-            md['MDATA_KEY_BITRATE'] = str(md['MDATA_KEY_BITRATE'])[0:3]+"kbps"
+            md['MDATA_KEY_BITRATE'] = str(md['MDATA_KEY_BITRATE']/1000)+"kbps"
 
             filepath = None
             #file is recorded by Airtime