diff --git a/README.txt b/README.txt
index 62b4986a..7a46bf69 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 ==============================================================================
 TradeDangerous
 Copyright (C) Oliver "kfsone" Smith, July 2014
-REQUIRES PYTHON 3.4 OR HIGHER.
+REQUIRES PYTHON 3.0 OR HIGHER.
 ==============================================================================
 
 == What is Trade Dangerous?
@@ -725,6 +725,7 @@ When TradeDB and TradeCalc do not currently provide built-in queries for
 the information you need, you can revert to the SQL Database with the
 TradeDB.query() and TradeDB.fetch_all() commands.
 
+See "cli.py" for examples.
 
 == Change Log Archive
 ==============================================================================
diff --git a/data/Station.csv b/data/Station.csv
index 1be03af1..94c5c192 100644
--- a/data/Station.csv
+++ b/data/Station.csv
@@ -1,36 +1,36 @@
 name@System.system_id,unq:name,ls_from_star
-'10 Canum Venaticorum','10 Canum Venaticorum-Station',0.0
+'10 Canum Venaticorum','Janifer Port',0.0
 '10 Ursae Majoris','10 Ursae Majoris-Station',0.0
 '16 c Ursae Majoris','16 c Ursae Majoris-Station',0.0
 '17 Crateris','17 Crateris-Station',0.0
 '20 Leonis Minoris','20 Leonis Minoris-Station',0.0
-'21 Draco','21 Draco-Station',0.0
+'21 Draco','Roberts Port',0.0
 '24 Iota Crateris','24 Iota Crateris-Station',0.0
-'26 Draconis','26 Draconis-Station',0.0
+'26 Draconis','Bouch Beacon',0.0
 '35 Draconis','35 Draconis-Station',0.0
 '36 Ursae Majoris','36 Ursae Majoris-Station',0.0
-'37 Xi Bootis','37 Xi Bootis-Station',0.0
+'37 Xi Bootis','Schirba Plant',0.0
 '41 Gamma Serpentis','41 Gamma Serpentis-Station',0.0
-'44 chi Draconis','44 chi Draconis-Station',0.0
+'44 chi Draconis','Lawson Camp',0.0
 '47 Cassiopeiae','47 Cassiopeiae-Station',0.0
 '47 Ursae Majoris','47 Ursae Majoris-Station',0.0
-'54 G. Antlia','54 G. Antlia-Station',0.0
+'54 G. Antlia','Boas Orbital',0.0
 '59 Virginis','59 Virginis-Station',0.0
 '60 Tau Draconis','60 Tau Draconis-Station',0.0
 '61 Ursae Majoris','61 Ursae Majoris-Station',0.0
 '61 Virginis','61 Virginis-Station',0.0
 '66 Draconis','66 Draconis-Station',0.0
-'68 Draconis','68 Draconis-Station',0.0
-'70 Virginis','70 Virginis-Station',0.0
+'68 Draconis','Gaspar De Lemos Port',0.0
+'70 Virginis','Reis Platform',0.0
 'Abrogo','Abrogo-Station',0.0
-'Acihaut','Acihaut-Station',0.0
-'Acurukunabogamal','Acurukunabogamal-Station',0.0
+'Acihaut','Cuffey Plant',0.0
+'Acurukunabogamal','Aguirre Terminal',0.0
 'Adityaraguala','Adityaraguala-Station',0.0
 'Aegilips','Aegilips-Station',0.0
 'Aeneas','Aeneas-Station',0.0
-'Aganippe','Aganippe-Station',0.0
+'Aganippe','Julian Market',0.0
 'Agwe','Agwe-Station',0.0
-'Akhenaten','Akhenaten-Station',0.0
+'Akhenaten','Wang Platform',0.0
 'Aknango','Aknango-Station',0.0
 'Al Mina','Al Mina-Station',0.0
 'Aladu Kuan Gon','Aladu Kuan Gon-Station',0.0
@@ -38,26 +38,26 @@ name@System.system_id,unq:name,ls_from_star
 'Alcor','Alcor-Station',0.0
 'Algorab','Algorab-Station',0.0
 'Alrai','Alrai-Station',0.0
-'Ammapa','Ammapa-Station',0.0
+'Ammapa','Bamford Enterprise',0.0
 'Amun','Amun-Station',0.0
 'Anaiwal','Anaiwal-Station',0.0
 'Andancan','Andancan-Station',0.0
-'Andoe','Andoe-Station',0.0
+'Andoe','Moffitt Settlement',0.0
 'Anemoi','Anemoi-Station',0.0
 'Anete','Anete-Station',0.0
 'Aninohini','Aninohini-Station',0.0
-'Anlave','Anlave-Station',0.0
-'Ansari','Ansari-Station',0.0
+'Anlave','Suri Park',0.0
+'Ansari','Wiberg Colony',0.0
 'Antevorta','Antevorta-Station',0.0
-'Antinica','Antinica-Station',0.0
+'Antinica','Benyovszky Terminal',0.0
 'Anyanwu','Anyanwu-Station',0.0
-'Ao Guang','Ao Guang-Station',0.0
-'Ao Qin','Ao Qin-Station',0.0
+'Ao Guang','Kotov Settlement',0.0
+'Ao Qin','Chapman Hub',0.0
 'Ao Shun','Ao Shun-Station',0.0
-'Apalai','Apalai-Station',0.0
+'Apalai','Gubarev Base',0.0
 'Apura','Apura-Station',0.0
-'Arcturus','Arcturus-Station',0.0
-'Arin','Arin-Station',0.0
+'Arcturus','Fort Harrison',0.0
+'Arin','Kettle Landing',0.0
 'Asellus Primus','Foster Research Lab',171
 'Asellus Primus','Beagle 2 Landing',1252
 'Ashtart','Ashtart-Station',0.0
@@ -73,36 +73,37 @@ name@System.system_id,unq:name,ls_from_star
 'Awabatamori','Awabatamori-Station',0.0
 'Awngtei','Awngtei-Station',0.0
 'Azaladshu','Azaladshu-Station',0.0
-'Baga','Baga-Station',0.0
+'Baga','Shipton Exchange',0.0
 'Balmus','Balmus-Station',0.0
 'Bast','Bast-Station',0.0
 'Batani','Batani-Station',0.0
-'Baudus','Baudus-Station',0.0
+'Baudus','Agnesi City',0.0
 'BD+03 2279','BD+03 2279-Station',0.0
 'BD+03 2316','BD+03 2316-Station',0.0
 'BD+16 2404','BD+16 2404-Station',0.0
 'BD+26 2184','BD+26 2184-Station',0.0
 'BD+27 1739','BD+27 1739-Station',0.0
-'BD+29 2405','BD+29 2405-Station',0.0
+'BD+29 2405','Shaara City',0.0
 'BD+47 2112','Olivas Settlement',230
-'BD+55 1519','BD+55 1519-Station',0.0
+'BD+55 1519','Eskridge Orbital',0.0
 'BD+57 2595','BD+57 2595-Station',0.0
 'BD+63 1764','BD+63 1764-Station',0.0
 'BD+64 1452','BD+64 1452-Station',0.0
-'BD+65 1846','BD+65 1846-Station',0.0
+'BD+65 1846','Shargin Beacon',0.0
 'BD+66 193','BD+66 193-Station',0.0
 'BD+67 1409','BD+67 1409-Station',0.0
 'BD+71 1033','BD+71 1033-Station',0.0
 'BD+72 545','BD+72 545-Station',0.0
-'BD+74 526','BD+74 526-Station',0.0
+'BD+74 526','Smith Prospect',0.0
 'BD+87 118','BD+87 118-Station',0.0
 'BD-01 2784','BD-01 2784-Station',0.0
 'BD-18 3106','BD-18 3106-Station',0.0
 'Begou','Begou-Station',0.0
 'Belobog','Belobog-Station',0.0
-'BF Canis Venatici','BF Canis Venatici-Station',0.0
+'BF Canis Venatici','Kornbluth Dock',0.0
 'Bhaguti','Bhaguti-Station',0.0
-'Bhotega','Bhotega-Station',0.0
+'Bhotega','Buchli Port',114
+'Bhotega','Newton Station',167
 'Bhotepa','Bhotepa-Station',0.0
 'Binbeal','Binbeal-Station',0.0
 'Bingui','Bingui-Station',0.0
@@ -119,7 +120,7 @@ name@System.system_id,unq:name,ls_from_star
 'Bunda','Bunda-Station',0.0
 'Buryacuan Wu','Buryacuan Wu-Station',0.0
 'Caeronthudti','Caeronthudti-Station',0.0
-'Caicius','Caicius-Station',0.0
+'Caicius','Bridges Survey',0.0
 'Caluayaksheper','Caluayaksheper-Station',0.0
 'Candjinan','Candjinan-Station',0.0
 'Carnoeck','Carnoeck-Station',0.0
@@ -128,51 +129,51 @@ name@System.system_id,unq:name,ls_from_star
 'Cavashira','Cavashira-Station',0.0
 'Cavins','Cavins-Station',0.0
 'CD-35 6972','CD-35 6972-Station',0.0
-'CE Bootis','CE Bootis-Station',0.0
+'CE Bootis','Sellers Relay',0.0
 'Cenil','Cenil-Station',0.0
-'Chaac','Chaac-Station',0.0
-'Chapoyo','Chapoyo-Station',0.0
+'Chaac','Antonio De Andrade',0.0
+'Chapoyo','Piccard Port',0.0
 'Chara','Reilly Refinery',11738
-'Chaxiraxi','Chaxiraxi-Station',0.0
+'Chaxiraxi','Brother''s Progress',0.0
 'Chechehet','Chechehet-Station',0.0
 'Chelmen','Chelmen-Station',0.0
-'Chemaku','Chemaku-Station',0.0
+'Chemaku','Bartoe Platform',0.0
 'Chi Herculis','Gorbatko Reserve',899
 'Chi Herculis','Gemar Orbital',899
 'Chini','Chini-Station',0.0
-'Chongquan','Chongquan-Station',0.0
+'Chongquan','Eisele Park',0.0
 'Chontantici','Chontantici-Station',0.0
 'Choujemait','Choujemait-Station',0.0
 'Ciguru','Ciguru-Station',0.0
 'Circios','Circios-Station',0.0
 'CM Draco','CM Draco-Station',0.0
-'Coelrind','Coelrind-Station',0.0
-'Coriccha','Coriccha-Station',0.0
+'Coelrind','Siegel Hanger',0.0
+'Coriccha','Cunningham',0.0
 'Corioskeh Tryth','Corioskeh Tryth-Station',0.0
 'CPD-23 501','CPD-23 501-Station',0.0
-'CR Draco','CR Draco-Station',0.0
+'CR Draco','Strekalov Settlement',0.0
 'Cuages','Cuages-Station',0.0
 'Cybele','Cybele-Station',0.0
 'Czernovale','Czernovale-Station',0.0
 'Dagaz','Dagaz-Station',0.0
 'Dahan','Dahan Gateway',468
 'Dahan','Dahan 3 Metalworks',1854
-'Dakantjarini','Dakantjarini-Station',0.0
-'Darahk','Darahk-Station',0.0
-'Demeter','Demeter-Station',0.0
+'Dakantjarini','Nachtigal Vision',0.0
+'Darahk','Noblehome',0.0
+'Demeter','Marusek Settlement',0.0
 'Denebola','Volkov Dock',567
-'Denebola','Chomsky Point',1379
-'Denebola','Chamitoff Point',7485
+'Denebola','Chomsky Point',1371
+'Denebola','Chamitoff Point',7482
 'Dierfar','Dierfar-Station',0.0
-'Difu','Difu-Station',0.0
+'Difu','Backers Pledge High',0.0
 'Divja Mu','Divja Mu-Station',0.0
 'Djedet','Djedet-Station',0.0
-'Doris','Doris-Station',0.0
-'DT Virginis','DT Virginis-Station',0.0
-'Duamta','Duamta-Station',0.0
-'DX 799','DX 799-Station',0.0
-'DX Cancri','DX Cancri-Station',0.0
-'Dyaushis','Dyaushis-Station',0.0
+'Doris','Isherwood Dock',0.0
+'DT Virginis','Chun Station',0.0
+'Duamta','Rutherford Gateway',0.0
+'DX 799','Shargin Plant',0.0
+'DX Cancri','Horowitz Landing',0.0
+'Dyaushis','Helmholtz Station',0.0
 'EGGR 431','EGGR 431-Station',0.0
 'Egovedunuvitra','Egovedunuvitra-Station',0.0
 'Ehlangai','Ehlangai-Station',0.0
@@ -183,62 +184,62 @@ name@System.system_id,unq:name,ls_from_star
 'Eranin','Eranin 4 Survey',2024
 'Eravarenth','Eravarenth-Station',0.0
 'Erlaza','Erlaza-Station',0.0
-'Eta Corvi','Eta Corvi-Station',0.0
+'Eta Corvi','Ivins Plant',0.0
 'Eta Draconis','Eta Draconis-Station',0.0
 'Etznabihik Mangk','Etznabihik Mangk-Station',0.0
 'Evergreen','Evergreen-Station',0.0
 'Exbeur','Exbeur-Station',0.0
-'FAUST 2688','FAUST 2688-Station',0.0
-'Feng Huang','Feng Huang-Station',0.0
+'FAUST 2688','Faust 2688-Station',0.0
+'Feng Huang','Murdoch Plant',0.0
 'Fianna','Fianna-Station',0.0
 'Fionn','Fionn-Station',0.0
-'Flousop','Flousop-Station',0.0
-'FN Virginis','FN Virginis-Station',0.0
+'Flousop','Fawcett Installation',0.0
+'FN Virginis','Priestley Port',0.0
 'Friggirawi','Friggirawi-Station',0.0
 'Fu Haiting','Fu Haiting-Station',0.0
 'G 113-20','G 113-20-Station',0.0
-'G 121-8','G 121-8-Station',0.0
-'G 123-49','G 123-49-Station',0.0
-'G 14-6','G 14-6-Station',0.0
+'G 121-8','Brosnan Gateway',0.0
+'G 123-49','JET-GANG',0.0
+'G 14-6','Yamazaki Orbital',0.0
 'G 146-5','G 146-5-Station',0.0
 'G 175-42','G 175-42-Station',0.0
-'G 180-18','Alexandria Gateway',8.59
-'G 180-18','Rozhdestvensky Ring',13.9
-'G 180-18','Allen Ring',27.1
-'G 181-6','Thomas Installation',483
-'G 181-6','Dezhurov Platform',21362
-'G 203-47','G 203-47-Station',0.0
+'G 180-18','Alexandria Gateway',8.97
+'G 180-18','Rozhdestvensky Ring',16
+'G 180-18','Allen Ring',29.3
+'G 181-6','Thomas Installation',485
+'G 181-6','Dezhurov Platform',21366
+'G 203-47','Michelson Terminal',0.0
 'G 224-46','G 224-46-Station',0.0
 'G 239-25','G 239-25-Station',0.0
 'G 250-34','G 250-34-Station',0.0
 'G 65-9','G 65-9-Station',0.0
-'G 89-32','G 89-32-Station',0.0
-'GD 140','GD 140-Station',0.0
-'Gendalla','Gendalla-Station',0.0
-'Gendini','Gendini-Station',0.0
-'Gera','Gera-Station',0.0
-'Gliese 3371','Gliese 3371-Station',0.0
+'G 89-32','EISELE PARK',0.0
+'GD 140','Fujimori Hub',0.0
+'Gendalla','Normand Platform',0.0
+'Gendini','Houtman Gateway',0.0
+'Gera','Kennicott Platform',0.0
+'Gliese 3371','Navigator Colony',0.0
 'Gliese 9843','Gliese 9843-Station',0.0
 'Gomm Crua','Gomm Crua-Station',0.0
-'Gong Gu','Gong Gu-Station',0.0
+'Gong Gu','Cheli Dock',0.0
 'GQ Virginis','GQ Virginis-Station',0.0
-'Grabri','Grabri-Station',0.0
-'Groombridge 1618','Groombridge 1618-Station',0.0
-'Guangul','Guangul-Station',0.0
+'Grabri','Platform',0.0
+'Groombridge 1618','Gernhardt Hub',0.0
+'Guangul','Laue''s Claim',0.0
 'Gunnovii','Gunnovii-Station',0.0
 'Guy','Guy-Station',0.0
-'h Draconis','h Draconis-Station',0.0
-'Hach','Hach-Station',0.0
+'h Draconis','Brislington',0.0
+'Hach','Mohmand Settlement',0.0
 'Hadad','Hadad-Station',0.0
 'Haeditjaray','Haeditjaray-Station',0.0
-'Hagalaz','Hagalaz-Station',0.0
+'Hagalaz','De Andrade Ring',0.0
 'Haidjaram','Haidjaram-Station',0.0
-'Hambula','Hambula-Station',0.0
+'Hambula','Qureshi Hub',0.0
 'Haokah','Haokah-Station',0.0
 'Hared','Hared-Station',0.0
-'Haribaluayai','Haribaluayai-Station',0.0
+'Haribaluayai','Debye Port',0.0
 'Havat','Havat-Station',0.0
-'HDS 1879','HDS 1879-Station',0.0
+'HDS 1879','Hedin orbital',0.0
 'Heheng De','Heheng De-Station',0.0
 'Helios','Helios-Station',0.0
 'HIP 105557','HIP 105557-Station',0.0
@@ -246,20 +247,20 @@ name@System.system_id,unq:name,ls_from_star
 'HIP 109479','HIP 109479-Station',0.0
 'HIP 110773','HIP 110773-Station',0.0
 'HIP 111496','HIP 111496-Station',0.0
-'HIP 113477','HIP 113477-Station',0.0
+'HIP 113477','Diophantus Port',0.0
 'HIP 113905','HIP 113905-Station',0.0
-'HIP 114099','HIP 114099-Station',0.0
+'HIP 114099','Bacigalupi Mine',0.0
 'HIP 114769','HIP 114769-Station',0.0
 'HIP 2422','HIP 2422-Station',0.0
 'HIP 2453','HIP 2453-Station',0.0
-'HIP 4907','HIP 4907-Station',0.0
+'HIP 4907','Edison Platform',0.0
 'HIP 85887','HIP 85887-Station',0.0
 'HIP 91906','HIP 91906-Station',0.0
 'Hlocidirus','Hlocidirus-Station',0.0
 'Hlooyn','Hlooyn-Station',0.0
-'Holiacan','Holiacan-Station',0.0
+'Holiacan','Hopi',0.0
 'HR 3862','HR 3862-Station',0.0
-'HR 3991','HR 3991-Station',0.0
+'HR 3991','Greenland Exchange',0.0
 'HR 4979','HR 4979-Station',0.0
 'HR 7925','HR 7925-Station',0.0
 'HR 8423','HR 8423-Station',0.0
@@ -268,13 +269,13 @@ name@System.system_id,unq:name,ls_from_star
 'Hsien Baji','Hsien Baji-Station',0.0
 'Hun Banja','Hun Banja-Station',0.0
 'Huokang','Huokang-Station',0.0
-'Hyperion','Hyperion-Station',0.0
+'Hyperion','Ivens Ring',0.0
 'i Bootis','Chango Dock',1098
 'i Bootis','Maher Stellar Research',20929
 'Igororai','Igororai-Station',0.0
 'Ikpenones','Ikpenones-Station',0.0
 'Issin','Issin-Station',0.0
-'Istanu','Istanu-Station',0.0
+'Istanu','Hayden Ring',0.0
 'Ithaca','Ithaca-Station',0.0
 'Jaitu','Jaitu-Station',0.0
 'Janjak','Janjak-Station',0.0
@@ -293,29 +294,29 @@ name@System.system_id,unq:name,ls_from_star
 'Kali','Kali-Station',0.0
 'Kamchaultultula','Kamchaultultula-Station',0.0
 'Kanati','Kanati-Station',0.0
-'Kanos','Kanos-Station',0.0
+'Kanos','Lee Station',0.0
 'Karovices','Karovices-Station',0.0
 'Kassi Hua','Kassi Hua-Station',0.0
-'Katae','Katae-Station',0.0
+'Katae','Coulomb Survey',0.0
 'Kato','Kato-Station',0.0
-'Keiadjara','Keiadjara-Station',0.0
+'Keiadjara','Brown Hub',0.0
 'Keian Gu','Keian Gu-Station',0.0
-'Keling','Keling-Station',0.0
+'Keling','Lopez De Villalobos',0.0
 'Keries','Derrickson''s Escape',270
 'Khernidjal','Khernidjal-Station',0.0
-'Kholedo','Kholedo-Station',0.0
+'Kholedo','Cowpercity',0.0
 'Khong Qin Gu','Khong Qin Gu-Station',0.0
 'Kishia','Kishia-Station',0.0
-'Kokobujundji','Kokobujundji-Station',0.0
+'Kokobujundji','Buchli Station',0.0
 'Kokoto','Kokoto-Station',0.0
 'Kongi','Kongi-Station',0.0
-'Korubu','Korubu-Station',0.0
-'Kotaition','Kotaition-Station',0.0
+'Korubu','Markov Gateway',0.0
+'Kotaition','Bykovsky Vision',0.0
 'Krumine','Krumine-Station',0.0
 'Kuikian Batji','Kuikian Batji-Station',0.0
 'Kumana','Kumana-Station',0.0
 'Kunapalanezti','Kunapalanezti-Station',0.0
-'Kunbuluan','Kunbuluan-Station',0.0
+'Kunbuluan','Ayerdhal Orbital',0.0
 'Kungati','Kungati-Station',0.0
 'Kurngali','Kurngali-Station',0.0
 'Kurui Gubi','Kurui Gubi-Station',0.0
@@ -325,24 +326,24 @@ name@System.system_id,unq:name,ls_from_star
 'Kwamennero Kojin','Kwamennero Kojin-Station',0.0
 'Labed','Labed-Station',0.0
 'Lakluit','Lakluit-Station',0.0
-'Lalande 18115','Lalande 18115-Station',0.0
-'Lalande 22954','Lalande 22954-Station',0.0
+'Lalande 18115','Gilliland Port',0.0
+'Lalande 22954','Haber Terminal',0.0
 'Lalande 29917','Lalande 29917-Station',0.0
 'Lalande 30699','Lalande 30699-Station',0.0
-'Lalande 37923','Lalande 37923-Station',0.0
-'Las Xenangaresti','Las Xenangaresti-Station',0.0
+'Lalande 37923','Keyes City',0.0
+'Las Xenangaresti','Murdoch Station',0.0
 'Latucairhemaiabi','Latucairhemaiabi-Station',0.0
 'LAWD 17','LAWD 17-Station',0.0
-'LAWD 52','LAWD 52-Station',0.0
-'LDS 2314','LDS 2314-Station',0.0
+'LAWD 52','Guerrero Horizons',0.0
+'LDS 2314','Mcdonald Colony',0.0
 'LDS 413','LDS 413-Station',0.0
 'Lei Ta Tetona','Lei Ta Tetona-Station',0.0
 'Leng Wanjadimuru','Leng Wanjadimuru-Station',0.0
 'LFT 1072','LFT 1072-Station',0.0
 'LFT 1421','LFT 1421-Station',0.0
-'LFT 1446','LFT 1446-Station',0.0
-'LFT 1748','LFT 1748-Station',0.0
-'LFT 424','LFT 424-Station',0.0
+'LFT 1446','Bosch Settlement',0.0
+'LFT 1748','Longyear Port',0.0
+'LFT 424','England City',0.0
 'LFT 601','LFT 601-Station',0.0
 'LFT 625','LFT 625-Station',0.0
 'LFT 682','LFT 682-Station',0.0
@@ -350,16 +351,16 @@ name@System.system_id,unq:name,ls_from_star
 'LFT 709','LFT 709-Station',0.0
 'LFT 820','LFT 820-Station',0.0
 'LFT 824','LFT 824-Station',0.0
-'LFT 859','LFT 859-Station',0.0
-'LFT 880','LFT 880-Station',0.0
+'LFT 859','Stross City',0.0
+'LFT 880','Baker Platform',5.68
 'LFT 90','LFT 90-Station',0.0
 'LFT 926','LFT 926-Station',0.0
 'LFT 945','LFT 945-Station',0.0
 'LFT 992','LFT 992-Station',0.0
-'LHS 1065','LHS 1065-Station',0.0
+'LHS 1065','Hornblower Platform',90855
 'LHS 1101','LHS 1101-Station',0.0
-'LHS 1167','LHS 1167-Station',0.0
-'LHS 140','LHS 140-Station',0.0
+'LHS 1167','Fangrim''s Folly',0.0
+'LHS 140','Onizuka Orbital',581
 'LHS 1505','LHS 1505-Station',0.0
 'LHS 1663','LHS 1663-Station',0.0
 'LHS 1882','LHS 1882-Station',0.0
@@ -368,9 +369,9 @@ name@System.system_id,unq:name,ls_from_star
 'LHS 1963','LHS 1963-Station',0.0
 'LHS 2037','LHS 2037-Station',0.0
 'LHS 207','LHS 207-Station',0.0
-'LHS 2088','LHS 2088-Station',0.0
+'LHS 2088','Comer''s Inheritance',0.0
 'LHS 2123','LHS 2123-Station',0.0
-'LHS 215','LHS 215-Station',0.0
+'LHS 215','Lubin Port',0.0
 'LHS 2157','LHS 2157-Station',0.0
 'LHS 2166','LHS 2166-Station',0.0
 'LHS 221','LHS 221-Station',0.0
@@ -390,54 +391,54 @@ name@System.system_id,unq:name,ls_from_star
 'LHS 2471','LHS 2471-Station',0.0
 'LHS 2477','LHS 2477-Station',0.0
 'LHS 2482','LHS 2482-Station',0.0
-'LHS 2494','LHS 2494-Station',0.0
-'LHS 250','LHS 250-Station',0.0
-'LHS 2541','LHS 2541-Station',0.0
+'LHS 2494','Heceta Colony',0.0
+'LHS 250','Kovalesky Enterprise',0.0
+'LHS 2541','Artyukhin Platform',0.0
 'LHS 2552','LHS 2552-Station',0.0
 'LHS 259','LHS 259-Station',0.0
 'LHS 262','LHS 262-Station',0.0
-'LHS 2651','LHS 2651-Station',0.0
-'LHS 2661','LHS 2661-Station',0.0
-'LHS 2691','LHS 2691-Station',0.0
+'LHS 2651','Schmitz Gateway',0.0
+'LHS 2661','Irwin Gateway',0.0
+'LHS 2691','Ivanchenkov Colony',0.0
 'LHS 274','LHS 274-Station',0.0
-'LHS 2764a','LHS 2764a-Station',0.0
-'LHS 278','LHS 278-Station',0.0
+'LHS 2764a','Serre Port',0.0
+'LHS 278','Clebsch Colony',0.0
 'LHS 2789','LHS 2789-Station',0.0
 'LHS 2819','LHS 2819-Station',0.0
-'LHS 283','LHS 283-Station',0.0
+'LHS 283','Zoline Enterprise',0.0
 'LHS 287','LHS 287-Station',0.0
 'LHS 2884','LHS 2884-Station',0.0
-'LHS 2887','LHS 2887-Station',0.0
-'LHS 2936','LHS 2936-Station',0.0
-'LHS 295','LHS 295-Station',0.0
-'LHS 3006','LHS 3006-Station',0.0
+'LHS 2887','Massimino Dock',0.0
+'LHS 2936','Ferguson Relay',0.0
+'LHS 295','White Settlement',0.0
+'LHS 3006','WCM Transfer Orbital',0.0
 'LHS 301','LHS 301-Station',0.0
 'LHS 302','LHS 302-Station',0.0
-'LHS 3057','LHS 3057-Station',0.0
+'LHS 3057','Wallace Colony',0.0
 'LHS 306','LHS 306-Station',0.0
 'LHS 317','LHS 317-Station',0.0
-'LHS 3262','LHS 3262-Station',0.0
+'LHS 3262','Lacaille Prospect',0.0
 'LHS 331','LHS 331-Station',0.0
 'LHS 336','LHS 336-Station',0.0
 'LHS 346','LHS 346-Station',0.0
-'LHS 351','LHS 351-Station',0.0
-'LHS 3549','LHS 3549-Station',0.0
-'LHS 355','LHS 355-Station',0.0
+'LHS 351','Brunel Hub',0.0
+'LHS 3549','Baydukov Base',0.0
+'LHS 355','Foucault Landing',0.0
 'LHS 3586','LHS 3586-Station',0.0
-'LHS 3631','LHS 3631-Station',0.0
-'LHS 369','LHS 369-Station',0.0
-'LHS 371','LHS 371-Station',0.0
+'LHS 3631','Currie Hub',0.0
+'LHS 369','Cavendish Port',0.0
+'LHS 371','Fischer Works',0.0
 'LHS 380','LHS 380-Station',0.0
 'LHS 3877','LHS 3877-Station',0.0
-'LHS 391','LHS 391-Station',0.0
-'LHS 411','LHS 411-Station',0.0
-'LHS 417','LHS 417-Station',0.0
-'LHS 450','LHS 450-Station',0.0
+'LHS 391','Savinykh Works',0.0
+'LHS 411','Kuhn Colony',0.0
+'LHS 417','Gernhardt Camp',0.0
+'LHS 450','Wilson Relay',0.0
 'LHS 5072','LHS 5072-Station',0.0
 'LHS 5287','LHS 5287-Station',0.0
 'LHS 6128','LHS 6128-Station',0.0
 'LHS 6197','LHS 6197-Station',0.0
-'LHS 6282','LHS 6282-Station',0.0
+'LHS 6282','Kendrick Base',0.0
 'LHS 6309','Carey Colony',73
 'LHS 6309','Ryumin Terminal',133
 'LHS 6309','Smeaton Port',2531
@@ -445,29 +446,29 @@ name@System.system_id,unq:name,ls_from_star
 'LHS 64','LHS 64-Station',0.0
 'Li Quang','Li Quang-Station',0.0
 'Loga','Loga-Station',0.0
-'Logoni','Logoni-Station',0.0
-'Lokapuri','Lokapuri-Station',0.0
+'Logoni','Knight Platform',0.0
+'Lokapuri','McArthur Dock',0.0
 'Lopu Maid Fo','Lopu Maid Fo-Station',0.0
 'LP 1-52','LP 1-52-Station',0.0
-'LP 102-320','LP 102-320-Station',0.0
+'LP 102-320','Shepard Hub',0.0
 'LP 131-55','LP 131-55-Station',0.0
-'LP 167-64','LP 167-64-Station',0.0
+'LP 167-64','Chu City',0.0
 'LP 167-71','LP 167-71-Station',0.0
 'LP 211-12','LP 211-12-Station',0.0
 'LP 27-9','LP 27-9-Station',0.0
-'LP 29-188','LP 29-188-Station',0.0
+'LP 29-188','Smith Enterprise',0.0
 'LP 30-55','LP 30-55-Station',0.0
-'LP 320-359','LP 320-359-Station',0.0
+'LP 320-359','Fisher Camp',0.0
 'LP 322-836','LP 322-836-Station',0.0
 'LP 36-115','LP 36-115-Station',0.0
 'LP 37-75','LP 37-75-Station',0.0
 'LP 377-100','LP 377-100-Station',0.0
 'LP 45-128','LP 45-128-Station',0.0
-'LP 465-14','LP 465-14-Station',0.0
+'LP 465-14','Oluwafemi Terminal',0.0
 'LP 48-567','LP 48-567-Station',0.0
 'LP 488-37','LP 488-37-Station',0.0
 'LP 5-88','LP 5-88-Station',0.0
-'LP 51-17','LP 51-17-Station',0.0
+'LP 51-17','Archambault Horizons',0.0
 'LP 58-247','LP 58-247-Station',0.0
 'LP 60-205','LP 60-205-Station',0.0
 'LP 617-37','LP 617-37-Station',0.0
@@ -475,7 +476,7 @@ name@System.system_id,unq:name,ls_from_star
 'LP 672-42','LP 672-42-Station',0.0
 'LP 673-13','LP 673-13-Station',0.0
 'LP 675-76','LP 675-76-Station',0.0
-'LP 71-157','LP 71-157-Station',0.0
+'LP 71-157','Buckland Colony',0.0
 'LP 732-94','LP 732-94-Station',0.0
 'LP 734-11','LP 734-11-Station',0.0
 'LP 787-52','LP 787-52-Station',0.0
@@ -491,161 +492,161 @@ name@System.system_id,unq:name,ls_from_star
 'LP 908-11','LP 908-11-Station',0.0
 'LP 98-132','Freeport',184
 'LP 98-132','Prospect Five',389
-'LP Draconis','LP Draconis-Station',0.0
-'LTT 10482','LTT 10482-Station',0.0
+'LP Draconis','McDivitt Settlement',0.0
+'LTT 10482','Hubble Relay',0.0
 'LTT 12680','LTT 12680-Station',0.0
 'LTT 12990','LTT 12990-Station',0.0
-'LTT 15294','LTT 15294-Station',0.0
+'LTT 15294','Tem Ring',0.0
 'LTT 16523','LTT 16523-Station',0.0
 'LTT 16979','LTT 16979-Station',0.0
 'LTT 3919','LTT 3919-Station',0.0
-'LTT 4131','LTT 4131-Station',0.0
+'LTT 4131','Ponce de Leon Station',0.0
 'LTT 4150','LTT 4150-Station',0.0
 'LTT 4376','LTT 4376-Station',0.0
 'LTT 4447','LTT 4447-Station',0.0
-'LTT 4461','LTT 4461-Station',0.0
+'LTT 4461','Artsebarsky Gateway',0.0
 'LTT 4527','LTT 4527-Station',0.0
 'LTT 4549','LTT 4549-Station',0.0
 'LTT 4730','LTT 4730-Station',0.0
 'LTT 4772','LTT 4772-Station',0.0
 'LTT 4898','LTT 4898-Station',0.0
 'LTT 5131','LTT 5131-Station',0.0
-'LTT 5455','LTT 5455-Station',0.0
+'LTT 5455','Blaha Legacy',0.0
 'LU Velorum','LU Velorum-Station',0.0
 'Lucab Ku','Lucab Ku-Station',0.0
-'Luggerates','Luggerates-Station',0.0
-'Lugien Chabtani','Lugien Chabtani-Station',0.0
+'Luggerates','Stewart Settlement',0.0
+'Lugien Chabtani','Conklin Ring',0.0
 'Luhman 16','Luhman 16-Station',0.0
-'Luyten 674-15','Luyten 674-15-Station',0.0
-'Luyten''s Star','Luyten''s Star-Station',0.0
+'Luyten 674-15','Sinclair Relay',0.0
+'Luyten''s Star','Still Outpost',0.0
 'Macomaneleng Mu','Macomaneleng Mu-Station',0.0
 'Magec','Xiaoguan Hub',131
 'Magec','Garriott Outpost',335
 'Magec','Trumpler Dock',4541
-'Maitaokona','Maitaokona-Station',0.0
+'Maitaokona','Gresley Gateway',0.0
 'Maitis','Maitis-Station',0.0
 'Malanquiya','Malanquiya-Station',0.0
 'Malina','Malina-Station',0.0
 'Maljenni','Maljenni-Station',0.0
-'Manarato','Manarato-Station',0.0
+'Manarato','Goldstein Installation',0.0
 'Manbai Chac Moco','Manbai Chac Moco-Station',0.0
 'Mankob','Mankob-Station',0.0
 'Mannheim','Mannheim-Station',0.0
 'Maranarinjhian Hsi','Maranarinjhian Hsi-Station',0.0
-'Marasing','Marasing-Station',0.0
+'Marasing','Thiele Enterprise',0.0
 'Maraupol Bumbin','Maraupol Bumbin-Station',0.0
 'Marditj','Marditj-Station',0.0
 'Markanomovoy','Markanomovoy-Station',0.0
 'Marojini','Marojini-Station',0.0
-'Marsinatani','Marsinatani-Station',0.0
+'Marsinatani','Hewish Relay',0.0
 'Maujinagoto','Maujinagoto-Station',0.0
 'Mbuthamovites','Mbuthamovites-Station',0.0
-'MCC 858','MCC 858-Station',0.0
+'MCC 858','Jacquard Orbital',0.0
 'Megrez','Megrez-Station',0.0
 'Melcior','Melcior-Station',0.0
-'Meliae','Meliae-Station',0.0
+'Meliae','Shawl Beacon',0.0
 'Midgcut','Midgcut-Station',0.0
-'Mildeptu','Mildeptu-Station',0.0
+'Mildeptu','Gerst Platform',0.0
 'Mildjarayuta','Mildjarayuta-Station',0.0
 'Minawara','Minawara-Station',0.0
 'Miola','Miola-Station',0.0
 'Miquich','Miquich-Station',0.0
-'Mizar','Mizar-Station',0.0
+'Mizar','Borel Park',0.0
 'Mobokomu','Mobokomu-Station',0.0
 'Mokojing','Mokojing-Station',0.0
 'Momoirent','Momoirent-Station',0.0
-'Morgor','Romanek''s Folly',917
-'Moros','Moros-Station',0.0
+'Morgor','Romanek''s Folly',916
+'Moros','Tesla Depot',0.0
 'Moscab Kutja','Moscab Kutja-Station',0.0
-'Mu Nora','Mu Nora-Station',0.0
+'Mu Nora','Virts Port',0.0
 'Muango','Muango-Station',0.0
-'Mufrid','Mufrid-Station',0.0
-'Mullag','Mullag-Station',0.0
+'Mufrid','Hardwick Base',0.0
+'Mullag','Kelly City',0.0
 'Muncheim','Muncheim-Station',0.0
 'Nagariggam','Nagariggam-Station',0.0
 'Nahundi','Nahundi-Station',0.0
 'Nakuma','Nakuma-Station',0.0
-'Nang Ta-khian','Nang Ta-khian-Station',0.0
-'Naraka','Naraka-Station',0.0
+'Nang Ta-khian','Hay Point',0.0
+'Naraka','Novitski Oasis',0.0
 'Neche','Neche-Station',0.0
 'Nemepawe','Nemepawe-Station',0.0
-'Nener','Nener-Station',0.0
+'Nener','Popov Dock',0.0
 'Ngardamayo','Ngardamayo-Station',0.0
 'Ngolitjali','Ngolitjali-Station',0.0
 'Ngoloki Anaten','Ngoloki Anaten-Station',0.0
-'Nicobarese','Nicobarese-Station',0.0
+'Nicobarese','Berezovoy Station',0.0
 'Njikan','Njikan-Station',0.0
 'NLTT 26813','NLTT 26813-Station',0.0
 'NLTT 34715','NLTT 34715-Station',0.0
-'NLTT 46621','NLTT 46621-Station',0.0
-'NLTT 48502','NLTT 48502-Station',0.0
+'NLTT 46621','Hope Point',0.0
+'NLTT 48502','Webb Holdings',0.0
 'NLTT 50716','NLTT 50716-Station',0.0
-'NLTT 53889','NLTT 53889-Station',0.0
+'NLTT 53889','Roosa Platform',0.0
 'Nuenets','Nuenets-Station',0.0
 'Nuguynici','Nuguynici-Station',0.0
-'Nuwang','Nuwang-Station',0.0
+'Nuwang','Schade Outpost',0.0
 'Nzam Cakua','Nzam Cakua-Station',0.0
-'Nzambassee','Nzambassee-Station',0.0
-'Okinoukhe','Okinoukhe-Station',0.0
-'Okuapang','Okuapang-Station',0.0
+'Nzambassee','Garriott Stop',0.0
+'Okinoukhe','Stableford Ring',0.0
+'Okuapang','Pribylov Park',0.0
 'Olgrea','Olgrea-Station',0.0
 'Onduwatya','Onduwatya-Station',0.0
 'Opala','Meikle Point',1391
 'Opala','Onizuka''s Hold',1449
 'Opala','Romanenko Estate',1451
 'Ori','Ori-Station',0.0
-'OT Serpentis','OT Serpentis-Station',0.0
+'OT Serpentis','Serebrov Port',0.0
 'Ovid','Abe Works',379
 'Ovid','Bradfield Orbital',377
-'Pachanu','Pachanu-Station',0.0
-'Pan','Pan-Station',0.0
-'Pangluya','Pangluya-Station',0.0
+'Pachanu','Aubakirov Hub',0.0
+'Pan','Gunn Plant',0.0
+'Pangluya','Bradbury Works',0.0
 'Parcae','Parcae-Station',0.0
-'Paul-Friedrichs Star','Paul-Friedrichs Star-Station',0.0
-'Pemede','Pemede-Station',0.0
+'Paul-Friedrichs Star','Paul-Friedrichs Base Camp',0.0
+'Pemede','Berners-Lee Terminal',0.0
 'Perendi','Perendi-Station',0.0
 'Phra Zhan','Phra Zhan-Station',0.0
-'Pi-fang','Pi-fang-Station',0.0
+'Pi-fang','Brooks Estate',0.0
 'Piran','Piran-Station',0.0
-'Pliny','Pliny-Station',0.0
+'Pliny','Sharman Gateway',0.0
 'Pollux','Pollux-Station',0.0
 'Popon','Popon-Station',0.0
 'PPM 41187','PPM 41187-Station',0.0
 'Privir','Privir-Station',0.0
-'Procyon','Procyon-Station',0.0
-'Psamathe','Psamathe-Station',0.0
+'Procyon','Manakov Dock',0.0
+'Psamathe','Nelson Gateway',0.0
 'PW Hydrae','PW Hydrae-Station',0.0
 'Quiness','Quiness-Station',0.0
 'Rabates','Rabates-Station',0.0
 'Rahu','Rahu-Station',0.0
-'Rakapila','Rakapila-Station',0.0
+'Rakapila','Stone Enterprise',0.0
 'Ratri','Ratri-Station',0.0
 'Rauratunab','Rauratunab-Station',0.0
 'Rhea','Rhea-Station',0.0
 'Rho Cancri','Rho Cancri-Station',0.0
 'Ross 1003','Ross 1003-Station',0.0
 'Ross 1015','Ross 1015-Station',0.0
-'Ross 104','Ross 104-Station',0.0
+'Ross 104','Glenn Dock',0.0
 'Ross 1051','Ross 1051-Station',0.0
 'Ross 1057','Ross 1057-Station',0.0
 'Ross 112','Ross 112-Station',0.0
-'Ross 128','Ross 128-Station',0.0
+'Ross 128','Warren Prison Mine',0.0
 'Ross 130','Huxley Relay',0.0
-'Ross 210','Ross 210-Station',0.0
+'Ross 210','Viktorenko Park',0.0
 'Ross 211','Ross 211-Station',0.0
-'Ross 318','Ross 318-Station',0.0
+'Ross 318','Koch Hub',0.0
 'Ross 446','Ross 446-Station',0.0
 'Ross 447','Ross 447-Station',0.0
-'Ross 486','Ross 486-Station',0.0
-'Ross 490','Ross 490-Station',0.0
+'Ross 486','Brash Vision',0.0
+'Ross 490','Delucas Landing',0.0
 'Ross 667','Ross 667-Station',0.0
 'Ross 695','Ross 695-Station',0.0
 'Ross 85','Ross 85-Station',0.0
 'Ross 860','Ross 860-Station',0.0
-'Ross 905','Morukov Platform',16.6
-'Ross 905','Xing Dock',943
+'Ross 905','Morukov Platform',16.1
+'Ross 905','Xing Dock',945
 'Ross 93','Ross 93-Station',0.0
-'Ross 986','Ross 986-Station',0.0
+'Ross 986','Jones Station',0.0
 'Sak Chelmir','Sak Chelmir-Station',0.0
 'Salarhul','Salarhul-Station',0.0
 'Samkyha','Samkyha-Station',0.0
@@ -653,64 +654,65 @@ name@System.system_id,unq:name,ls_from_star
 'Seber','Seber-Station',0.0
 'Sekhemet','Sekhemet-Station',0.0
 'Selebegua','Selebegua-Station',0.0
-'Seting','Seting-Station',0.0
-'Shama','Shama-Station',0.0
+'Seting','Cox Landing',0.0
+'Shama','Clairaut Port',0.0
 'Shamash','Shamash-Station',0.0
 'Shapash','Shapash-Station',0.0
 'Shebayeb','Shebayeb-Station',0.0
-'Sheela Na Gig','Sheela Na Gig-Station',0.0
-'Sigma Bootis','Sigma Bootis-Station',0.0
+'Sheela Na Gig','Birkhoff Terminal',0.0
+'Sigma Bootis','Meikle Platform',0.0
 'Skeggiko O','Skeggiko O-Station',0.0
 'Slatus','Slatus-Station',0.0
-'Sofagre','Sofagre-Station',0.0
-'Sokoji','Sokoji-Station',0.0
-'Song Te Tians','Song Te Tians-Station',0.0
-'Sopdu','Sopdu-Station',0.0
-'Stein 2051','Stein 2051-Station',0.0
-'Styx','Gerst Port',68.6
-'Styx','Chi Hub',652
-'Sudz','Sudz-Station',0.0
+'Sofagre','Markov Park',0.0
+'Sokoji','Cavendish Relay',0.0
+'Song Te Tians','La Cosa Dock',0.0
+'Sopdu','Borlaug Camp',0.0
+'Stein 2051','Trevithick Port',0.0
+'Styx','Gerst Port',70
+'Styx','Chi Hub',653
+'Sudz','Divis Enterprise',0.0
 'Sukub Tungatis','Sukub Tungatis-Station',0.0
 'Sukuruaco','Sukuruaco-Station',0.0
 'Supen','Supen-Station',0.0
-'Suraci','Suraci-Station',0.0
-'Surya','Surya-Station',0.0
+'Suraci','Priestley Ring',0.0
+'Surya','Burbank Camp',0.0
 'T''ang Bumbain','T''ang Bumbain-Station',0.0
-'Tabassapisi','Tabassapisi-Station',0.0
+'Tabassapisi','Parise Camp',0.0
 'Taexalkoloine','Taexalkoloine-Station',0.0
-'Taima Baijuhacmoora','Taima Baijuhacmoora-Station',0.0
+'Taima Baijuhacmoora','Mills Park',0.0
 'Taleachishvakhrud','Taleachishvakhrud-Station',0.0
 'Taliesin','Taliesin-Station',0.0
-'Talitha','Talitha-Station',0.0
+'Talitha','Ross Platform',0.0
 'Taosha','Taosha-Station',0.0
 'Tarasa','Tarasa-Station',0.0
-'Tatil','Tatil-Station',0.0
-'Tau Bootis','Tau Bootis-Station',0.0
+'Tatil','Mallett Settlement',0.0
+'Tau Bootis','Weitz Hub',0.0
 'Tau-1 Hydrae','Tau-1 Hydrae-Station',0.0
 'Tefenhua','Tefenhua-Station',0.0
-'Teng Yeh','Garan Survey',3082
-'Teng Yeh','Haxel Station',3082
-'Teng Yeh','Phillips Hub',3111
-'Teng Yeh','Korniyenko Dock',3111
-'Teng Yeh','Zhen Port',3138
+'Teng Yeh','Garan Survey',3089
+'Teng Yeh','Haxel Station',3089
+'Teng Yeh','Phillips Hub',3094
+'Teng Yeh','Korniyenko Dock',3093
+'Teng Yeh','Zhen Port',3117
 'Theta Cygni','Theta Cygni-Station',0.0
-'Theta Ursae Majoris','Theta Ursae Majoris-Station',0.0
+'Theta Ursae Majoris','Landsteiner Silo',0.0
 'Thosim Biamh','Thosim Biamh-Station',0.0
 'Thoth','Thoth-Station',0.0
+'Thottacahuan Wang','Baxter Camp',0.0
 'Thraskias','Thraskias-Station',0.0
 'Tiapalan','Tiapalan-Station',0.0
-'Tiethay','Tiethay-Station',0.0
+'Tiethay','Santos Plant1',0.0
 'Tilian','Keeler Rest',196
 'Tilian','Maunder''s Hope',196
 'Tinia','Tinia-Station',0.0
 'Tivertsi','Tivertsi-Station',0.0
-'Tollan','Tollan-Station',0.0
+'Tollan','Bayliss Base',0.0
 'Trepin','Trepin-Station',0.0
 'Tripu','Vinogradov Installation',2077
 'Tripu','Laval City',3411
 'Tsetan','Tsetan-Station',0.0
-'Tsohodiae','Tsohodiae-Station',0.0
-'Tun','Tun-Station',0.0
+'Tsohodiae','Barba Port',0.0
+'Tun','Tun''s Wart',226
 'Turmakul','Turmakul-Station',0.0
 'Tyche','Tyche-Station',0.0
 'Tyr','Tyr-Station',0.0
@@ -719,10 +721,10 @@ name@System.system_id,unq:name,ls_from_star
 'V2151 Cygni','V2151 Cygni-Station',0.0
 'V417 Hydrae','V417 Hydrae-Station',0.0
 'V419 Hydrae','V419 Hydrae-Station',0.0
-'V538 Aurigae','V538 Aurigae-Station',0.0
+'V538 Aurigae','Card Park',0.0
 'V740 Cassiopeiae','V740 Cassiopeiae-Station',0.0
 'V886 Centauri','V886 Centauri-Station',0.0
-'V989 Cassiopeiae','V989 Cassiopeiae-Station',0.0
+'V989 Cassiopeiae','Low Works',0.0
 'Vega','Vega-Station',0.0
 'Veneri','Veneri-Station',0.0
 'Verboni','Verboni-Station',0.0
@@ -730,29 +732,29 @@ name@System.system_id,unq:name,ls_from_star
 'VZ Corvi','VZ Corvi-Station',0.0
 'Wadjuk','Wadjuk-Station',0.0
 'Wakarendians','Wakarendians-Station',0.0
-'Wanggu','Wanggu-Station',0.0
+'Wanggu','Besonders Port',0.0
 'Wathlanukh','Wathlanukh-Station',0.0
 'Wei Jung','Wei Jung-Station',0.0
 'Wen Tsakimori','Wen Tsakimori-Station',0.0
 'Widjararappan','Widjararappan-Station',0.0
 'Widjigarasir','Widjigarasir-Station',0.0
-'Wikmeang','Wikmeang-Station',0.0
-'WISE 1506+7027','WISE 1506+7027-Station',0.0
-'Wolf 1409','Wolf 1409-Station',0.0
-'Wolf 1478','Wolf 1478-Station',0.0
+'Wikmeang','Ivanov Hub',0.0
+'WISE 1506+7027','Silverberg Relay',0.0
+'Wolf 1409','Carter Vision',0.0
+'Wolf 1478','Franklin Orbital',0.0
 'Wolf 1481','Wolf 1481-Station',0.0
 'Wolf 248','Wolf 248-Station',0.0
-'Wolf 294','Wolf 294-Station',0.0
-'Wolf 359','Wolf 359-Station',0.0
+'Wolf 294','Hippalus Station',0.0
+'Wolf 359','Lomas Orbiter',0.0
 'Wolf 369','Wolf 369-Station',0.0
 'Wolf 393','Wolf 393-Station',0.0
-'Wolf 417','Wolf 417-Station',0.0
-'Wolf 424','Wolf 424-Station',0.0
-'Wolf 437','Wolf 437-Station',0.0
-'Wolf 46','Wolf 46-Station',0.0
+'Wolf 417','Egan Port',0.0
+'Wolf 424','Sping Terminal',0.0
+'Wolf 437','Fischer Platform',0.0
+'Wolf 46','Fischer City',0.0
 'Wolf 485a','Wolf 485a-Station',0.0
-'Wolf 497','Wolf 497-Station',0.0
-'Wolf 54','Wolf 54-Station',0.0
+'Wolf 497','Bamford Station',0.0
+'Wolf 54','Meeking''s Way',0.0
 'Wolf 562','Wolf 562-Station',0.0
 'Wosyra Pao','Kaku Terminal',54.6
 'Wosyra Pao','Kovalyonok City',62.4
@@ -760,29 +762,29 @@ name@System.system_id,unq:name,ls_from_star
 'Wosyra Pao','Onufrienko Settlement',91
 'Wosyra Pao','Agnesi Refinery',125
 'Wu Gondru','Wu Gondru-Station',0.0
-'Wunian','Wunian-Station',0.0
-'WX Ursa Majoris','WX Ursa Majoris-Station',0.0
+'Wunian','Sellers Landing',0.0
+'WX Ursa Majoris','Teng-Hui Terminal',0.0
 'Wyrd','Vonarburg Co-operative',161
 'Wyrd','Bokeili Station',849
 'Wyrd','Gareth Edwards Park',849
 'Xelabara','Xelabara-Station',0.0
-'Xi Ursae Majoris','Xi Ursae Majoris-Station',0.0
-'Xi Wangkala','Xi Wangkala-Station',0.0
+'Xi Ursae Majoris','Joule Settlement',0.0
+'Xi Wangkala','Ross Colony',0.0
 'Xolotl','Xolotl-Station',0.0
 'Ya''Nomisiyaces','Ya''Nomisiyaces-Station',0.0
 'Yakan','Yakan-Station',0.0
 'Yakawana','Yakawana-Station',0.0
 'Yanyan','Yanyan-Station',0.0
-'Yarigui','Yarigui-Station',0.0
+'Yarigui','Schade City',0.0
 'Ye''kuapemas','Ye''kuapemas-Station',0.0
 'Yeru Bao Hinu','Yeru Bao Hinu-Station',0.0
 'Yoruba','Yoruba-Station',0.0
 'Yuggsanawyddis','Yuggsanawyddis-Station',0.0
 'Yugusitanitou','Yugusitanitou-Station',0.0
 'Zangi','Zangi-Station',0.0
-'Zaraluvul','Zaraluvul-Station',0.0
+'Zaraluvul','Sturckow City',0.0
 'Zenmaku','Zenmaku-Station',0.0
-'Zeta Herculis','Shepherd Ring',8171
+'Zeta Herculis','Shepherd Ring',8151
 'Zombardgriti','Zombardgriti-Station',0.0
 'Zombo','Zombo-Station',0.0
 'Zopiates','Zopiates-Station',0.0
diff --git a/data/corrections.py b/data/corrections.py
index f7a2118c..ed9351a1 100644
--- a/data/corrections.py
+++ b/data/corrections.py
@@ -10,10 +10,6 @@
 }
 
 stations = {
-    'LOUIS DE LACAILLE PROSPECT': 'Lacaille Prospect',
-    'HOPKINS HANGAR': 'Cori Terminal',
-    'HOPKINS HANGER': 'Cori Terminal',
-    'EJETA STATION': DELETED,
     "10 CANUM VENATICORUM-STATION": "Janifer Port",
     "21 DRACO-STATION": "Roberts Port",
     "26 DRACONIS-STATION": "Bouch Beacon",
@@ -22,14 +18,23 @@
     "54 G. ANTLIA-STATION": "Boas Orbital",
     "61 URSAE MAJORIS-STATION": "Worlidge Dock",
     "61 VIRGINIS-STATION": "Artsebarsky Station",
+    "68 DRACONIS-STATION": "Gaspar De Lemos Port",
     "70 VIRGINIS-STATION": "Reis Platform",
+    "ABNETT PLATEFORM": "Abnett Platform",
     "ACIHAUT-STATION": "Cuffey Plant",
+    "ACURUKUNABOGAMAL-STATION": "Aguirre Terminal",
     "AGANIPPE-STATION": "Julian Market",
+    "AKHENATEN-STATION": "Wang Platform",
     "ALRAI-STATION": "Becquerel Gateway",
     "AMMAPA-STATION": "Bamford Enterprise",
+    "ANDOE-STATION": "Moffitt Settlement",
     "ANEMOI-STATION": "Abasheli Point",
     "ANLAVE-STATION": "Suri Park",
+    "ANSARI-STATION": "Wiberg Colony",
+    "ANTINICA-STATION": "Benyovszky Terminal",
+    "AO GUANG-STATION": "Kotov Settlement",
     "AO QIN-STATION": "Chapman Hub",
+    "APALAI-STATION": "Gubarev Base",
     "ARCTURUS-STATION": "Fort Harrison",
     "ARIN-STATION": "Kettle Landing",
     "AULIS-STATION": "Dezhurov Gateway",
@@ -38,13 +43,19 @@
     "BAUDUS-STATION": "Agnesi City",
     "BD+29 2405-STATION": "Shaara City",
     "BD+55 1519-STATION": "Eskridge Orbital",
+    "BD+65 1846-STATION": "Shargin Beacon",
     "BD+74 526-STATION": "Smith Prospect",
     "BF CANIS VENATICI-STATION": "Kornbluth Dock",
+    "BHOTEGA-STATION": "Buchli Port",
     "BRAHMA-STATION": "Banks Landing",
+    "CAICIUS-STATION": "Bridges Survey",
+    "CE BOOTIS-STATION": "Sellers Relay",
     "CHAAC-STATION": "Antonio De Andrade",
     "CHAPOYO-STATION": "Piccard Port",
+    "CHAXIRAXI-STATION": "Brother's Progress",
     "CHEMAKU-STATION": "Bartoe Platform",
     "CHONGQUAN-STATION": "Eisele Park",
+    "CHU HUB": "Chi Hub",
     "CM DRACO-STATION": "Anderson Escape",
     "COELRIND-STATION": "Siegel Hanger",
     "CORICCHA-STATION": "Cunningham",
@@ -52,59 +63,105 @@
     "DAKANTJARINI-STATION": "Nachtigal Vision",
     "DARAHK-STATION": "Noblehome",
     "DEMETER-STATION": "Marusek Settlement",
+    "DENEBOLA-STATION": "Chomsky Point",
+    "DIFU-STATION": "Backers Pledge High",
+    "DIVIS ENTERPRISE": "Divis Enterprise",
+    "DORIS-STATION": "Isherwood Dock",
     "DT VIRGINIS-STATION": "Chun Station",
     "DUAMTA-STATION": "Rutherford Gateway",
     "DX 799-STATION": "Shargin Plant",
     "DX CANCRI-STATION": "Horowitz Landing",
+    "DYAUSHIS-STATION": "Helmholtz Station",
+    "EJETA STATION": DELETED,
     "ETA CORVI-STATION": "Ivins Plant",
     "ETA DRACONIS-STATION": "Zahn Orbital",
     "EVERGREEN-STATION": "Stafford Terminal",
+    "FENG HUANG-STATION": "Murdoch Plant",
     "FLOUSOP-STATION": "Fawcett Installation",
+    "FN VIRGINIS-STATION": "Priestley Port",
+    "G 121-8-STATION": "Brosnan Gateway",
+    "G 123-49-STATION": "JET-GANG",
     "G 14-6-STATION": "Yamazaki Orbital",
+    "G 180-18-STATION": "Alexandria Gateway",
+    "G 181-6-STATION": "Dezhurov Platform",
     "G 203-47-STATION": "Michelson Terminal",
     "G 65-9-STATION": "Marconi Port",
+    "G 89-32-STATION": "EISELE PARK",
+    "GARAN SURVERY": "Garan Survey",
+    "GD 140-STATION": "Fujimori Hub",
+    "GENDALLA-STATION": "Normand Platform",
     "GENDINI-STATION": "Houtman Gateway",
+    "GERA-STATION": "Kennicott Platform",
     "GLIESE 3371-STATION": "Navigator Colony",
     "GONG GU-STATION": "Cheli Dock",
     "GQ VIRGINIS-STATION": "Garriott Colony",
+    "GRABRI-STATION": "Platform",
     "GROOMBRIDGE 1618-STATION": "Gernhardt Hub",
+    "GUANGUL-STATION": "Laue's Claim",
     "H DRACONIS-STATION": "Brislington",
     "HACH-STATION": "Mohmand Settlement",
     "HADAD-STATION": "Levy Settlement",
+    "HAGALAZ-STATION": "De Andrade Ring",
+    "HAMBULA-STATION": "Qureshi Hub",
+    "HARIBALUAYAI-STATION": "Debye Port",
     "HDS 1879-STATION": "Hedin Orbital",
+    "HIP 113477-STATION": "Diophantus Port",
+    "HIP 114099-STATION": "Bacigalupi Mine",
+    "HIP 4907-STATION": "Edison Platform",
     "HOLIACAN-STATION": "Hopi",
+    "HOPKINS HANGAR": "Cori Terminal",
+    "HR 3991-STATION": "Greenland Exchange",
     "HSIEN BAJI-STATION": "Novitski Mines",
     "HYPERION-STATION": "Ivens Ring",
     "ISTANU-STATION": "Hayden Ring",
     "ITHACA-STATION": "Hume Depot",
+    "IVANCHENKOV COLONY": "Ivanchenkov Colony",
     "K CAMELOPARDALIS-STATION": "Anning Station",
+    "KANOS-STATION": "Lee Station",
     "KATAE-STATION": "Coulomb Survey",
+    "KEIADJARA-STATION": "Brown Hub",
     "KELING-STATION": "Lopez De Villalobos",
     "KHOLEDO-STATION": "Cowpercity",
+    "KOKOBUJUNDJI-STATION": "Buchli Station",
     "KORUBU-STATION": "Markov Gateway",
     "KOTAITION-STATION": "Bykovsky Vision",
+    "KOVALESKY ENTERPRISE": "Kovalevsky Enterprise",
     "KUNBULUAN-STATION": "Ayerdhal Orbital",
     "LALANDE 18115-STATION": "Gilliland Port",
+    "LALANDE 22954-STATION": "Haber Terminal",
     "LALANDE 29917-STATION": "Cori Terminal",
+    "LALANDE 37923-STATION": "Keyes City",
     "LAS XENANGARESTI-STATION": "Murdoch Station",
     "LATUCAIRHEMAIABI-STATION": "Cavendish Station",
     "LAWD 52-STATION": "Guerrero Horizons",
     "LDS 2314-STATION": "Mcdonald Colony",
     "LFT 1446-STATION": "Bosch Settlement",
+    "LFT 1748-STATION": "Longyear Port",
     "LFT 424-STATION": "England City",
     "LFT 859-STATION": "Stross City",
     "LFT 880-STATION": "Baker Platform",
     "LFT 992-STATION": "Szulkin Mines",
+    "LHS 1065-STATION": "Hornblower Platform",
+    "LHS 1167-STATION": "Fangrim's Folly",
     "LHS 140-STATION": "Onizuka Orbital",
+    "LHS 2088-STATION": "Comer's Inheritance",
     "LHS 215-STATION": "Lubin Port",
     "LHS 2471-STATION": "Cowper Dock",
+    "LHS 2494-STATION": "Heceta Colony",
     "LHS 250-STATION": "Kovalevsky Enterprise",
+    "LHS 2541-STATION": "Artyukhin Platform",
+    "LHS 2651-STATION": "Schmitz Gateway",
+    "LHS 2661-STATION": "Irwin Gateway",
     "LHS 2691-STATION": "Ivanchenkov Colony",
+    "LHS 2764a-STATION": "Serre Port",
+    "LHS 278-STATION": "Clebsch Colony",
     "LHS 2819-STATION": "Tasaki Freeport",
+    "LHS 283-STATION": "Zoline Enterprise",
     "LHS 2884-STATION": "Abnett Platform",
     "LHS 2887-STATION": "Massimino Dock",
     "LHS 2936-STATION": "Ferguson Relay",
-    "LHS 3006-STATION": "Wcm Transfer Orbital",
+    "LHS 295-STATION": "White Settlement",
+    "LHS 3006-STATION": "WCM Transfer Orbital",
     "LHS 3057-STATION": "Wallace Colony",
     "LHS 3262-STATION": "Lacaille Prospect",
     "LHS 331-STATION": "Hopkinson City",
@@ -113,24 +170,37 @@
     "LHS 355-STATION": "Foucault Landing",
     "LHS 3631-STATION": "Currie Hub",
     "LHS 369-STATION": "Cavendish Port",
+    "LHS 371-STATION": "Fischer Works",
     "LHS 391-STATION": "Savinykh Works",
     "LHS 411-STATION": "Kuhn Colony",
     "LHS 417-STATION": "Gernhardt Camp",
     "LHS 450-STATION": "Wilson Relay",
     "LHS 5287-STATION": "Mcarthur's Reach",
+    "LHS 6282-STATION": "Kendrick Base",
     "LHS 64-STATION": "Kopra Survey",
     "LOGONI-STATION": "Knight Platform",
+    "LOKAPURI-STATION": "McArthur Dock",
+    "LOUIS DE LACAILLE PROSPECT": "Lacaille Prospect",
     "LP 102-320-STATION": "Shepard Hub",
     "LP 167-64-STATION": "Chu City",
+    "LP 29-188-STATION": "Smith Enterprise",
+    "LP 320-359-STATION": "Fisher Camp",
     "LP 465-14-STATION": "Oluwafemi Terminal",
     "LP 5-88-STATION": "Midgley Settlement",
+    "LP 51-17-STATION": "Archambault Horizons",
     "LP 64-194-STATION": "Longyear Survey",
     "LP 673-13-STATION": "Brown Orbital",
+    "LP 71-157-STATION": "Buckland Colony",
+    "LP DRACONIS-STATION": "McDivitt Settlement",
+    "LTT 10482-STATION": "Hubble Relay",
     "LTT 15294-STATION": "Tem Ring",
-    "LTT 4131-STATION": "Ponce De Leon Station",
+    "LTT 4131-STATION": "Ponce de Leon Station",
     "LTT 4461-STATION": "Artsebarsky Gateway",
+    "LTT 5455-STATION": "Blaha Legacy",
     "LUCAB KU-STATION": "Potter Station",
+    "LUGGERATES-STATION": "Stewart Settlement",
     "LUGIEN CHABTANI-STATION": "Conklin Ring",
+    "LUYTEN 674-15-STATION": "Sinclair Relay",
     "LUYTEN'S STAR-STATION": "Still Outpost",
     "MAITAOKONA-STATION": "Gresley Gateway",
     "MANARATO-STATION": "Goldstein Installation",
@@ -139,11 +209,16 @@
     "MARSINATANI-STATION": "Hewish Relay",
     "MCC 858-STATION": "Jacquard Orbital",
     "MELIAE-STATION": "Shawl Beacon",
+    "MILDEPTU-STATION": "Gerst Platform",
     "MIZAR-STATION": "Borel Park",
+    "MORGOR-STATION": "Romanek's Folly",
+    "MOROS-STATION": "Tesla Depot",
+    "MOXONS MOJO": "Moxon's Mojo",
     "MU NORA-STATION": "Virts Port",
     "MUFRID-STATION": "Hardwick Base",
     "MULLAG-STATION": "Kelly City",
     "NANG TA-KHIAN-STATION": "Hay Point",
+    "NARAKA-STATION": "Novitski Oasis",
     "NENER-STATION": "Popov Dock",
     "NGOLITJALI-STATION": "Vinogradov Platform",
     "NICOBARESE-STATION": "Berezovoy Station",
@@ -151,11 +226,16 @@
     "NLTT 48502-STATION": "Webb Holdings",
     "NLTT 53889-STATION": "Roosa Platform",
     "NUWANG-STATION": "Schade Outpost",
+    "NZAMBASSEE-STATION": "Garriott Stop",
     "OKINOUKHE-STATION": "Stableford Ring",
     "OKUAPANG-STATION": "Pribylov Park",
     "ORI-STATION": "Alexeyev Depot",
-    "PAUL-FRIEDRICHS STAR-STATION": "Paul-friedrichs Base Camp",
-    "PEMEDE-STATION": "Berners-lee Terminal",
+    "OT SERPENTIS-STATION": "Serebrov Port",
+    "PACHANU-STATION": "Aubakirov Hub",
+    "PAN-STATION": "Gunn Plant",
+    "PANGLUYA-STATION": "Bradbury Works",
+    "PAUL-FRIEDRICHS STAR-STATION": "Paul-Friedrichs Base Camp",
+    "PEMEDE-STATION": "Berners-Lee Terminal",
     "PI-FANG-STATION": "Brooks Estate",
     "PIRAN-STATION": "Garcia Gateway",
     "PLINY-STATION": "Sharman Gateway",
@@ -164,29 +244,53 @@
     "QUINESS-STATION": "Lockyer's Rest",
     "RAKAPILA-STATION": "Stone Enterprise",
     "ROSS 1015-STATION": "Bowersox Mines",
+    "ROSS 104-STATION": "Glenn Dock",
     "ROSS 1051-STATION": "Abetti Platform",
     "ROSS 128-STATION": "Warren Prison Mine",
+    "ROSS 130-STATION": "Huxley Relay",
     "ROSS 210-STATION": "Viktorenko Park",
     "ROSS 211-STATION": "Chilton Vision",
     "ROSS 318-STATION": "Koch Hub",
     "ROSS 486-STATION": "Brash Vision",
     "ROSS 490-STATION": "Delucas Landing",
+    "ROSS 905-STATION": "Morukov Platform",
+    "ROSS 986-STATION": "Jones Station",
     "SALARHUL-STATION": "Lavoisier Outpost",
     "SETING-STATION": "Cox Landing",
     "SHAMA-STATION": "Clairaut Port",
+    "SHEELA NA GIG-STATION": "Birkhoff Terminal",
+    "SHEPHERD RING": "Shepherd Ring",
+    "SIEGEL HANGER": "Siegel Hanger",
+    "SIGMA BOOTIS-STATION": "Meikle Platform",
+    "SOFAGRE-STATION": "Markov Park",
     "SOKOJI-STATION": "Cavendish Relay",
+    "SONG TE TIANS-STATION": "La Cosa Dock",
+    "SOPDU-STATION": "Borlaug Camp",
+    "STEIN 2051-STATION": "Trevithick Port",
+    "STURCKOW CITY": "Sturckow City",
+    "STYX-STATION": "Chi Hub",
     "SUDZ-STATION": "Divis Enterprise",
     "SUKUB TUNGATIS-STATION": "Allen Horizons",
     "SURACI-STATION": "Priestley Ring",
     "SURYA-STATION": "Burbank Camp",
     "TABASSAPISI-STATION": "Parise Camp",
     "TAEXALKOLOINE-STATION": "Rutherford Works",
+    "TAIMA BAIJUHACMOORA-STATION": "Mills Park",
+    "TALITHA-STATION": "Ross Platform",
     "TATIL-STATION": "Mallett Settlement",
     "TAU BOOTIS-STATION": "Weitz Hub",
+    "TENG YEH-STATION": "Zhen Port",
+    "THETA URSAE MAJORIS-STATION": "Landsteiner Silo",
+    "THOTTACAHUAN WANG-STATION": "Baxter Camp",
     "TIETHAY-STATION": "Santos Plant1",
+    "TOLLAN-STATION": "Bayliss Base",
     "TSOHODIAE-STATION": "Barba Port",
+    "TUN-STATION": "Tun's Wart",
     "TYR-STATION": "Walz Works",
     "V538 AURIGAE-STATION": "Card Park",
+    "V989 CASSIOPEIAE-STATION": "Low Works",
+    "VIKTORENKO PARK": "Viktorenko Park",
+    "WANGGU-STATION": "Besonders Port",
     "WEI JUNG-STATION": "Cooper Dock",
     "WIKMEANG-STATION": "Ivanov Hub",
     "WISE 1506+7027-STATION": "Silverberg Relay",
@@ -197,26 +301,18 @@
     "WOLF 417-STATION": "Egan Port",
     "WOLF 424-STATION": "Sping Terminal",
     "WOLF 437-STATION": "Fischer Platform",
+    "WOLF 46-STATION": "Fischer City",
     "WOLF 497-STATION": "Bamford Station",
+    "WOLF 54-STATION": "Meeking's Way",
     "WUNIAN-STATION": "Sellers Landing",
-    "WX URSA MAJORIS-STATION": "Teng-hui Terminal",
+    "WX URSA MAJORIS-STATION": "Teng-Hui Terminal",
     "XI URSAE MAJORIS-STATION": "Joule Settlement",
     "XI WANGKALA-STATION": "Ross Colony",
     "YANYAN-STATION": "Morin City",
     "YARIGUI-STATION": "Schade City",
     "YE'KUAPEMAS-STATION": "Hawke's Progress",
     "ZARALUVUL-STATION": "Sturckow City",
-    "SIEGEL HANGER": "Siegel Hanger",
-    "IVANCHENKOV COLONY": "Ivanchenkov Colony",
-    "ABNETT PLATEFORM": "Abnett Platform",
-    "MOXONS MOJO": "Moxon's Mojo",
-    "CHU HUB": "Chi Hub",
-    "GARAN SURVERY": "Garan Survey",
-    "VIKTORENKO PARK": "Viktorenko Park",
-    "DIVIS ENTERPRISE": "Divis Enterprise",
-    "STURCKOW CITY": "Sturckow City",
-    "SHEPHERD RING": "Shepherd Ring",
-    "ROSS 130-STATION": "Huxley Relay",
+    "ZETA HERCULIS-STATION": "Shepherd Ring",
 }
 
 categories = {