diff --git a/eddb.py b/eddb.py
index e959c4a6..c47f1c6a 100755
--- a/eddb.py
+++ b/eddb.py
@@ -31,7 +31,7 @@ if __name__ == "__main__":
 
     # Sphere around Jaques
     JX, JY, JZ = -9530.50000, -910.28125, 19808.12500
-    RJ2 = 50 * 50	# Furthest populated system is Eol Prou IW-W e1-1456 at 49.47 Ly
+    RJ2 = 75 * 75	# Furthest populated system is Pekoe at 50.16 Ly
 
     def around_jaques(x, y, z):
         return ((x - JX) * (x - JX) + (y - JY) * (y - JY) + (z - JZ) * (z - JZ)) <= RJ2
@@ -123,26 +123,8 @@ if __name__ == "__main__":
 
     # Hack - ensure duplicate system names are pointing at the more interesting system
     system_ids['Amo'] = 866
-    system_ids['Ogma'] = 14915		# in bubble, not Colonia
-    system_ids['Ratri'] = 16001		#   "
     system_ids['K Carinae'] = 375886	# both unpopulated
 
-    # 2.4 Colonia renames - https://github.com/themroc5/eddb.io/issues/136
-    system_ids['Poe'] = 2751046
-    system_ids['White Sun'] = 2277522
-    system_ids['Chrysus'] = 2911665
-    system_ids['Juniper'] = 692229
-    system_ids['Rodentia'] = 1481196
-    system_ids['Kajuku'] = 1937790
-    system_ids['Lycanthrope'] = 2221090
-    system_ids['Ogmar'] = 10931086
-    system_ids['Ratraii'] = 10918695
-    system_ids['Farwell'] = 9132855
-    system_ids['Carlota'] = 1218013
-    system_ids['Morpheus'] = 684221
-    system_ids['Earth Expeditionary Fleet'] = 8262285
-    system_ids['Centralis'] = 1581643
-
     # Some extra interesting systems
     system_ids['Sagittarius A*']       =   21276
     system_ids["Thor's Eye"]           =   34950
diff --git a/plugins/eddb.py b/plugins/eddb.py
index 706aaffc..b5c9870d 100644
--- a/plugins/eddb.py
+++ b/plugins/eddb.py
@@ -65,4 +65,5 @@ def journal_entry(cmdr, is_beta, system, station, entry, state):
     this.station['text'] = station or (system_id(system) and STATION_UNDOCKED or '')
 
 def cmdr_data(data, is_beta):
+    this.system = data['lastSystem']['name']
     this.station['text'] = data['commander']['docked'] and data['lastStarport']['name'] or (system_id(data['lastSystem']['name']) and STATION_UNDOCKED or '')
diff --git a/stations.p b/stations.p
index 14033bf3..87a3046b 100644
Binary files a/stations.p and b/stations.p differ
diff --git a/systems.p b/systems.p
index 683fc4bc..824c266c 100644
Binary files a/systems.p and b/systems.p differ