diff --git a/DATA/MISSIONS/M13/m13.ini b/DATA/MISSIONS/M13/m13.ini
index d7d0a716..aaab6943 100644
--- a/DATA/MISSIONS/M13/m13.ini
+++ b/DATA/MISSIONS/M13/m13.ini
@@ -2644,7 +2644,8 @@ Act_ActTrig = tradelane_westpoint
 [Trigger]
 nickname = tradelane_westpoint
 Cnd_TLEntered = Player, Li01_Trade_Lane_Ring_147, Li01_Trade_Lane_Ring_148
-Act_SetNNObj = goto_westpoint3
+;Act_SetNNObj = goto_westpoint3
+;Act_NNPath = 600007, 600007, Li01_09, Li01
 Act_ActTrig = tradelane_westpoint2
 
 [Trigger]
@@ -2677,6 +2678,8 @@ type = rep_inst, Li01, 600003, 1, -35488, -300, 28321, Li01_09
 nickname = jacobi_westpoint2
 Cnd_Timer = 10
 Act_EtherComm = jacobi_voice_m14, 600018, Player, dx_m14_0000_jacobi, -1, br_darcy_head, br_darcy_body
+;Act_NNPath = 600007, 600007, Li01_09, Li01
+Act_NNPath = 600007, 600007, Li01_Trade_Lane_Ring_147, Li01
 Act_ActTrig = jacobi_westpoint3
 
 [Trigger]
@@ -3017,6 +3020,7 @@ Act_ActTrig = rem_space_harrison01_test3
 nickname = rem_space_harrison01_test3
 Cnd_Timer = 10
 Act_EtherComm = harrison_voice_m14, 227159, Player, dx_m14_0000_HARRISON, -1, rh_captain_head, li_rockford_body
+Act_NNPath = 600007, 600007, Dock_Ring_Li01_01, Li01
 Act_ActTrig = rem_manhattan_harrison01
 
 [Trigger]
@@ -3315,19 +3319,14 @@ string_id = 10903
 faction = fc_n_grp
 system = Li05
 position = -18951, -300, 34452
-;archetype = gas_collector
-;loadout = gas_collector
-;position = -16575.4, -28.6535, 13567.6
 archetype = waypoint
-;loadout = dyson_city_platform
 label = waypoint_label
 radius = 0
 
 [Trigger]
 nickname = rem_undock1_harrison04
 system = Li01
-;Cnd_SpaceEnter = Li01
-Cnd_BaseExit = li13_01_base
+Cnd_BaseExit = li01_13_base
 Act_SpawnSolar = waypoint4
 Act_SpawnSolar = waypoint5
 Act_SpawnSolar = waypoint6
@@ -3371,7 +3370,6 @@ Act_ActTrig = rem_tradelane1_harrison04
 nickname = rem_tradelane1_harrison04
 Cnd_DistVec = inside, Player, -18951, -300, 34452, 2000
 Act_NNPath = 600006, 600006, Li01_12, Li01
-;HALLO
 
 [Trigger]
 nickname = rem_space_harrison05
@@ -3390,6 +3388,61 @@ nickname = rem_buffalo_rebus
 Cnd_LocEnter = deck, li01_12_base
 Act_AdjAcct = 2000000
 Act_AddRTC = missions\REM_ARCs\m014a_s005x_li01_01_nrml.ini
+Act_ActTrig = rem_undock1_buffalo01
+Act_ActTrig = rem_undock1_buffalo02
+
+[MsnSolar]
+nickname = waypoint10
+string_id = 10903
+faction = fc_n_grp
+system = Li05
+position = 59763, 0, -65135
+archetype = waypoint
+label = waypoint_label
+radius = 0
+
+[MsnSolar]
+nickname = navy_satellite1
+string_id = 216121
+faction = fc_lr_grp
+system = Li01
+position = 59763, 0, -65135
+archetype = navy_satellite
+pilot = MSN01b_Weapon_Platform
+label = lbl_hplat
+label = hostile_platform1
+radius = 0
+visit = UNKNOWABLE
+
+[MsnSolar]
+nickname = navy_satellite2
+string_id = 216121
+faction = fc_lr_grp
+system = Li01
+position = 59763, 0, -65135
+archetype = navy_satellite
+;loadout = navy_satellite_sm_load
+;pilot = MSN01b_Weapon_Platform
+;label = hostile_satellite1
+radius = 0
+visit = UNKNOWABLE
+
+[Trigger]
+nickname = rem_undock1_buffalo01
+system = Li01
+Cnd_BaseExit = li01_12_base
+Act_SpawnSolar = navy_satellite1
+
+[Trigger]
+nickname = rem_undock1_buffalo02
+Cnd_SpaceEnter = Li01
+Act_ActTrig = rem_undock1_buffalo03
+
+[Trigger]
+nickname = rem_undock1_buffalo03
+Cnd_Timer = 10
+Act_EtherComm = rebus_voice_m14, 600019, Player, dx_m14_0100_Rebus, -1, sh_female2_rebus_head, pl_female1_rebus_peasant_body_bust
+Act_NNPath = 600007, 600007, navy_satellite1, Li01
 
 
 ;Act_StartDialog = dlg_R001_0100
diff --git a/DATA/SOLAR/loadouts.ini b/DATA/SOLAR/loadouts.ini
index 864e74e0..0a0c4850 100644
--- a/DATA/SOLAR/loadouts.ini
+++ b/DATA/SOLAR/loadouts.ini
@@ -13323,7 +13323,7 @@ cargo = emergency_action_documents_liberty, 1
 
 [Loadout]
 nickname = navy_satellite_sm_load
-archetype = navy_satellite_relay_sm
+archetype = navy_satellite
 cargo = emergency_action_documents_liberty, 1
 
 ; pirate_transmitter_liberty_sm_load
diff --git a/DATA/SOLAR/solararch.ini b/DATA/SOLAR/solararch.ini
index 185e3898..d63c290e 100644
--- a/DATA/SOLAR/solararch.ini
+++ b/DATA/SOLAR/solararch.ini
@@ -9522,7 +9522,7 @@ fuse = intermed_damage_transport01, 0, 750
 fuse = intermed_damage_transport02, 0, 375
 
 [Solar]
-nickname = navy_satellite
+nickname = navy_satellite_test
 ids_name = 217116
 type = MISSION_SATELLITE
 DA_archetype = solar\misc\gas_collector.cmp
@@ -9531,7 +9531,7 @@ material_library = fx\envmapbasic.mat
 envmap_material = envmapbasic
 LODranges = 0, 999999
 mass = 10000
-loadout = gas_collector
+;loadout = navy_satellite_sm_load
 solar_radius = 300
 shape_name = NNM_SM_MINING
 hit_pts = 15000
@@ -9540,6 +9540,24 @@ fuse = fuse_gas_collector_burning, 0, 30000
 explosion_arch = explosion_docking_ring
 destructible = true
 
+[Solar]
+nickname = navy_satellite
+type = MISSION_SATELLITE
+;ids_name = 237031
+;ids_info = 300101
+DA_archetype = solar\misc\gas_collector.cmp
+material_library = solar\Solar_mat_misc01.mat
+material_library = fx\envmapbasic.mat
+envmap_material = envmapbasic
+LODranges = 0, 999999
+mass = 10000
+;loadout = li_cruiser_debris_front_wal_sm_load
+solar_radius = 1000
+destructible = true
+shape_name = NNM_SM_MINING
+explosion_arch = explosion_wplatform
+hit_pts = 2000
+
 ; Gravity Buoy Big
 
 [Solar]