diff --git a/__pycache__/load.cpython-312.pyc b/__pycache__/load.cpython-312.pyc
index 64f028a..60f66d7 100644
Binary files a/__pycache__/load.cpython-312.pyc and b/__pycache__/load.cpython-312.pyc differ
diff --git a/load.py b/load.py
index 401b703..6e33d1b 100644
--- a/load.py
+++ b/load.py
@@ -190,16 +190,24 @@ def journal_entry(cmdr, is_beta, system, station, entry, state):
 
     match entry['event']:
         case 'StartUp':
-            presence_largetext = get_ship_name(('{ship}').format(ship=state['ShipType']))
-            presence_smalltext = ('CMDR {cmdr}').format(cmdr=cmdr)
-            presence_largeimage = ('{ship}').format(ship=state['ShipType'])
-            presence_smallimage = 'edlogo'
+            presence_largetext = get_ship_name(('{ship}').format(ship=state['ShipType'])) + (' | {shipname}').format(shipname=state['ShipName']) + (' | {shipident}').format(shipident=state['ShipIdent'])
+            presence_smalltext = ('CMDR {cmdr}').format(cmdr=cmdr)# + ('{power}').format(power=entry['event', 'Powerplay'])
+            presence_largeimage = state['ShipType']
+            presence_smallimage = 'edlogosm'
             presence_state = _('In system {system}').format(system=system)
             presence_details = _('Docked at {station}').format(station=station) if station else _('Flying in normal space')
         case 'Location':
+            presence_largetext = get_ship_name(('{ship}').format(ship=state['ShipType'])) + (' | {shipname}').format(shipname=state['ShipName']) + (' | {shipident}').format(shipident=state['ShipIdent'])
+            presence_smalltext = ('CMDR {cmdr}').format(cmdr=cmdr)#, power=state['Power'])
+            presence_largeimage = state['ShipType']
+            presence_smallimage = 'edlogosm'
             presence_state = _('In system {system}').format(system=system)
             presence_details = _('Docked at {station}').format(station=station) if station else _('Flying in normal space')
         case 'StartJump':
+            presence_largetext = get_ship_name(('{ship}').format(ship=state['ShipType'])) + (' | {shipname}').format(shipname=state['ShipName']) + (' | {shipident}').format(shipident=state['ShipIdent'])
+            presence_smalltext = ('CMDR {cmdr}').format(cmdr=cmdr)#, power=state['Power'])
+            presence_largeimage = state['ShipType']
+            presence_smallimage = 'edlogosm'
             presence_state = _('Jumping')
             presence_details = _('Jumping to system {system}').format(system=entry['StarSystem']) if entry['JumpType'] == 'Hyperspace' else _('Preparing for supercruise')
         case 'SupercruiseEntry':
@@ -235,9 +243,14 @@ def journal_entry(cmdr, is_beta, system, station, entry, state):
             presence_details = _('Flying around {body}').format(body=planet) if entry['PlayerControlled'] else _('In SRV on {body}, ship in orbit').format(body=planet)
         case 'LeaveBody':
             presence_details = _('Supercruising')
-        case 'Loadout':
-            presence_largeimage = ('{ship}').format(ship=state['ShipType'])
-            presence_largetext = get_ship_name(('{ship}').format(ship=state['ShipType']))
+        case 'Disembark':
+            presence_largetext = ('Using the {suitcurrent} suit.').format(suitcurrent=state['SuitCurrent'])
+        case 'Embark':
+            presence_largeimage = state['ShipType']
+            presence_largetext = get_ship_name(('{ship}').format(ship=state['ShipType'])) + (' | {shipname}').format(shipname=state['ShipName']) + (' | {shipident}').format(shipident=state['ShipIdent'])
+        case 'Loadout': # when switching ships
+            presence_largeimage = state['ShipType']
+            presence_largetext = get_ship_name(('{ship}').format(ship=state['ShipType'])) + (' | {shipname}').format(shipname=state['ShipName']) + (' | {shipident}').format(shipident=state['ShipIdent'])
         case 'LaunchSRV':
             presence_details = _('In SRV on {body}').format(body=planet)
         case 'DockSRV':
@@ -246,6 +259,9 @@ def journal_entry(cmdr, is_beta, system, station, entry, state):
             # No specific action for other events
             pass
 
+    #if entry['TimePledged']:
+    #    presence_smalltext = presence_smalltext + (' | {power}').format(power=state['Power'])
+
     if (presence_state != this.presence_state or
     presence_details != this.presence_details or
     presence_largeimage != this.presence_large_image or