diff --git a/monitor.py b/monitor.py
index dac75ae9..31c2a507 100644
--- a/monitor.py
+++ b/monitor.py
@@ -336,8 +336,8 @@ class EDLogs(FileSystemEventHandler):  # type: ignore # See below
 
             for line in loghandle:
                 try:
-                    # if b'"event":"Location"' in line:
-                    #     logger.trace('"Location" event in the past at startup')
+                    if b'"event":"Location"' in line:
+                        logger.trace_if('journal.locations', '"Location" event in the past at startup')
 
                     self.parse_entry(line)  # Some events are of interest even in the past
 
@@ -417,22 +417,22 @@ class EDLogs(FileSystemEventHandler):  # type: ignore # See below
 
                     if b'"event":"Continue"' in line:
                         for _ in range(10):
-                            logger.trace("****")
-                        logger.trace('Found a Continue event, its being added to the list, we will finish this file up'
-                                     ' and then continue with the next')
+                            logger.trace_if('journal.continuation', "****")
+                        logger.trace_if('journal.continuation', 'Found a Continue event, its being added to the list, '
+                                        'we will finish this file up and then continue with the next')
 
                     self.event_queue.put(line)
 
                 if not self.event_queue.empty():
                     if not config.shutting_down:
-                        # logger.trace('Sending <<JournalEvent>>')
+                        logger.trace_if('journal.queue', 'Sending <<JournalEvent>>')
                         self.root.event_generate('<<JournalEvent>>', when="tail")
 
                 log_pos = loghandle.tell()
 
             if logfile != newlogfile:
                 for _ in range(10):
-                    logger.trace("****")
+                    logger.trace_if('journal.file', "****")
                 logger.info(f'New Journal File. Was "{logfile}", now "{newlogfile}"')
                 logfile = newlogfile
                 if loghandle:
@@ -464,7 +464,7 @@ class EDLogs(FileSystemEventHandler):  # type: ignore # See below
                     )
 
                     if not config.shutting_down:
-                        # logger.trace('Sending <<JournalEvent>>')
+                        logger.trace_if('journal.queue', 'Sending <<JournalEvent>>')
                         self.root.event_generate('<<JournalEvent>>', when="tail")
 
                     self.game_was_running = False
@@ -530,7 +530,7 @@ class EDLogs(FileSystemEventHandler):  # type: ignore # See below
                 self.cmdr = entry['Commander']
                 # 'Open', 'Solo', 'Group', or None for CQC (and Training - but no LoadGame event)
                 if not entry.get('Ship') and not entry.get('GameMode') or entry.get('GameMode', '').lower() == 'cqc':
-                    logger.trace_if('cqc-loadgame-events', f'loadgame to cqc: {entry}')
+                    logger.trace_if('journal.loadgame.cqc', f'loadgame to cqc: {entry}')
                     self.mode = 'CQC'
 
                 else:
@@ -764,8 +764,8 @@ class EDLogs(FileSystemEventHandler):  # type: ignore # See below
                     self.state['Body'] = entry.get('Body')
                     self.state['BodyType'] = entry.get('BodyType')
 
-                    # if event_type == 'location':
-                    #     logger.trace('"Location" event')
+                    if event_type == 'location':
+                        logger.trace_if('journal.locations', '"Location" event')
 
                 elif event_type == 'fsdjump':
                     self.planet = None
@@ -1869,16 +1869,16 @@ class EDLogs(FileSystemEventHandler):  # type: ignore # See below
             logger.debug('Called whilst self.thread is None, returning')
             return None
 
-        # logger.trace('Begin')
+        logger.trace_if('journal.queue', 'Begin')
         if self.event_queue.empty() and self.game_running():
             logger.error('event_queue is empty whilst game_running, this should not happen, returning')
             return None
 
-        # logger.trace('event_queue NOT empty')
+        logger.trace_if('journal.queue', 'event_queue NOT empty')
         entry = self.parse_entry(self.event_queue.get_nowait())
 
-        # if entry['event'] == 'Location':
-        #     logger.trace('"Location" event')
+        if entry['event'] == 'Location':
+            logger.trace_if('journal.locations', '"Location" event')
 
         if not self.live and entry['event'] not in (None, 'Fileheader'):
             # Game not running locally, but Journal has been updated
@@ -1906,8 +1906,8 @@ class EDLogs(FileSystemEventHandler):  # type: ignore # See below
                     ('SystemAddress', self.systemaddress),
                 ])
 
-            # if entry['event'] == 'Location':
-            #     logger.trace('Appending "Location" event to event_queue')
+            if entry['event'] == 'Location':
+                logger.trace_if('journal.locations', 'Appending "Location" event to event_queue')
 
             self.event_queue.put(json.dumps(entry, separators=(', ', ':')))