diff --git a/commands/export_cmd.py b/commands/export_cmd.py
index 775d75a7..0b5365bd 100644
--- a/commands/export_cmd.py
+++ b/commands/export_cmd.py
@@ -129,4 +129,4 @@ def run(results, cmdenv, tdb):
             filePath.unlink()
             cmdenv.DEBUG0("Delete empty file {file}'".format(file=filePath))
 
-    return None
+    return None
\ No newline at end of file
diff --git a/commands/import_cmd.py b/commands/import_cmd.py
index cc745b10..f4348ae0 100644
--- a/commands/import_cmd.py
+++ b/commands/import_cmd.py
@@ -142,4 +142,4 @@ def run(results, cmdenv, tdb):
     cache.importDataFromFile(tdb, cmdenv, filePath, pricesFh=fh)
 
     return None
-
+    
\ No newline at end of file
diff --git a/commands/station_cmd.py b/commands/station_cmd.py
index 178aaec4..c3c569a0 100644
--- a/commands/station_cmd.py
+++ b/commands/station_cmd.py
@@ -198,19 +198,7 @@ def checkSystemAndStation(tdb, cmdenv):
     # can be arrays. We need to make strings out of the arrays,
     # and then sanitize them for the '@SYS/STN' format, and
     # build a separate system and station name out of that.
-    envStnName = ' '.join(cmdenv.station).strip()
-    if cmdenv.system:
-        envSysName = ' '.join(cmdenv.system).strip().upper()
-        while envSysName.startswith('@'):
-            envSysName = envSysName[1:]
-        if not envSysName:
-            raise CommandLineError("Invalid system name: {}".format(
-                    ' '.join(cmdenv.system).strip()
-            ))
-    else:
-        envSysName = None
-
-    sysName, stnName = envSysName or "", envStnName or ""
+    stnName = ' '.join(cmdenv.station).strip()
 
     # Clean up the station name and potentially lift the system
     # name out of it.
@@ -222,21 +210,27 @@ def checkSystemAndStation(tdb, cmdenv):
     if slashPos > 0:
         sysName, stnName = stnName[:slashPos], stnName[slashPos+1:]
         sysName = sysName.upper()
+    else:
+        sysName = None
 
     if not stnName:
         raise CommandLineError("Invalid station name: {}".format(
                 envStnName
         ))
 
-    # Check for the case of different system names specified via
-    # --system and --station SYS/STN. But if the user does
-    # --system SYS --station SYS/STN then we allow that.
-    if envSysName and sysName != envSysName:
-        raise CommandLineError(
-                "Mismatch between --system {} and "
-                "system specified in station name ({})".format(
-                    envSysName, envStnName
-        ))
+    if cmdenv.system:
+        envSysName = ' '.join(cmdenv.system).upper()
+        if envSysName != sysName:
+            raise CommandLineError(
+                    "Mismatch between \"--system {}\" and "
+                    "system name in station specifier "
+                    "(\"{}\")".format(
+                        envSysName, sysName,
+            ))
+        sysName = envSysName
+
+    if not sysName:
+        raise CommandLineError("No system name specified")
 
     cmdenv.system, cmdenv.station = sysName, titleFixup(stnName)
 
diff --git a/corrections.py b/corrections.py
index 599f7f20..9ebe32ee 100644
--- a/corrections.py
+++ b/corrections.py
@@ -17,31 +17,60 @@
 }
 
 stations = {
+    "37 XI BOOTIS/SCHIRRA PLANT": "Schirba Plant",
+    "ALBICEVCI/DUBROVOLSKI SURVEY": "Dobrovolski Survey",
+    "AMAIT/LOPEZ DE VILLALOBOS": "Lopez De Villalobos Prospect",
     "AMARAK/WERNER VON SIEMENS VISON": "Werner Von Siemens Vision",
+    "ANAPOS/HERSCHEL PLATFORM": "Herschel Plant",
     "APOYOTA/FLINTSTATION": "Flint Station",
     "APOYOTA/HAHNRELAY": "Hahn Relay",
-    "EKONIR/MOREYVISION": "Morey Vision",
-    "TRELLA/TITTO COLONY": "Tito Colony",
-    "ORERVE/WATSON SATION": "Watson Station",
-    "MCC 467/ROB HUBBARD RING": "Ron Hubbard Ring",
-    "GCRV 4654/HERZEFELD LANDING": DELETED,
-    "LHS 220/CULPEPERCOLONY": DELETED,
-    "LHS 64/WIBERG HANGAR": DELETED,    # "Hanger",
-    "LP 862-184/MAYR HANGAR": "Mayr Hanger",
-    "TYR/GLASHOW": DELETED,
+    "AULIN/ALUIN ENTERPIRSE": "Aulin Enterprise",
+    "BD+13 693/DRUMMOND`S PROGRESS": "Drummond's Progress",
+    "BOLG/MOXONS MOJO": "Moxon's Mojo",
+    "CEMIESS/TITUS STATION": "Titius Station",
+    "DT VIRGINIS/CHUN STATION": "Chun Vision",
     "EGOVAE/ENOATE MARKET": "Endate Market",
-    "WOLF 1301/SAUNDER'S DIVE": "Saunders's Dive",
-    "VEQUESS/AGNEWS FOLLY": "Agnews' Folly",
-    "ONGKAMPAN/PATTERSON STATION:274": DELETED,
-    "ZETA AQUILAE/OEFELIEN": DELETED,
-    "ZETA AQUILAE/JULIAN GATEWAY": DELETED,
+    "EKONIR/MOREYVISION": "Morey Vision",
+    "GCRV 4654/HERZEFELD LANDING": "Herzfeld Landing",
     "GROOMBRIDGE 1618/FRANKUN RING": "Franklin Ring",
-    "WOLF 46/FISCHER CITY": DELETED,
-    "LTT 9455/OLEARY VISION": DELETED,
-    "HR 5451/MACDONALO HUB": DELETED,
-    "HR 5451/MACOONALO HUB": DELETED,
+    "HR 5451/MACDONALO HUB": "MacDonald Hub",
+    "HR 5451/MACOONALO HUB": "MacDonald Hub",
+    "HR 5451/MACOONALD HUB": "MacDonald Hub",
+    "JAWOLA/SUTCLIFFEPLATFORM": "Sutcliffe Platform",
+	"LEESTI/GEORGELUCAS": "George Lucas",
+    "LHS 220/CULPEPERCOLONY": "Culpeper Colony",
+    "LHS 250/KOVALESKY ENTERPRISE": "Kovalevsky Enterprise",
+    "LHS 2884/ABNETT PLATEFORM": "Abnett Platform",
+    "LHS 64/WIBERG HANGAR": "Wiberg Hanger",    # "Hanger",
+    "LP 862-184/MAYR HANGAR": "Mayr Hanger",
+    "LTT 15449/REILLI DOCK": "Reilly Dock",
+    "LTT 9455/OLEARY VISION": "O'Leary Vision",
+    "MANNONA/THORNYCROFY PENAL COLONY": "Thornycroft Penal Colony",
+    "MCC 467/ROB HUBBARD RING": "Ron Hubbard Ring",
+    "MOKOSH/LUBEN ORBITAL": "Lubin Orbital",
+    "NLTT 49528/O‹CONNOR LANDING": "O'Connor Landing",
+    "ONGKAMPAN/PATTERSON STATION:274": "Patterson Station",
+    "OPALA/ZAMK PLATFORM": "Zamka Platform",
+    "ORERVE/WATSON SATION": "Watson Station",
+    "PANGLUYA/BRADBURYWORKS": "Bradbury Works",
+    "PERENDI/Shepherd Installation": DELETED,
+    "RHO CANCRI/HAMILTON R,SERVE": "Hamilton Reserve",
+    "RHO CANCRI/HAMILTON R�SERVE": "Hamilton Reserve",
+    "TENG YEH/GARAN SURVERY": "Garan Survey",
+    "TRELLA/TITTO COLONY": "Tito Colony",
+    "TYR/GLASHOW": "Glashow Dock",
+    "V774 HERCULIS/MENDEL MINES'": "Mendel Mines",
     "V774 HERCULIS/MENOEL MINES": "Mendel Mines",
     "VALDA/CLAIRAUT OOCK": "Clairaut Dock",
+    "VEQUESS/AGNEWS FOLLY": "Agnews' Folly",
+    "WOLF 1301/SAUNDER'S DIVE": "Saunders's Dive",
+    "WOLF 46/FISCHER CITY": "Fischer Station",
+    "YAKABUGAI/SEREBOV STATION": "Serebrov Station",
+    "YAKABUGAI/SEREBROV": "Serebrov Station",
+    "YANYAN/MORYN CITY": "Morin City",
+    "ZETA AQUILAE/JULIAN GATEWAY": DELETED,
+    "ZETA AQUILAE/OEFELIEN": "Oefelein Plant",
+    "ZETA TRIANGULI AUSTRALIS/GUEST CITY2": "Guest City",
 
 #ADD_STATIONS_HERE
 }
diff --git a/data/ShipVendor.csv b/data/ShipVendor.csv
index 60b2ffb7..94703bc3 100644
--- a/data/ShipVendor.csv
+++ b/data/ShipVendor.csv
@@ -470,6 +470,18 @@ unq:!name@System.system_id,unq:name@Station.station_id,unq:name@Ship.ship_id
 'SKEGGIKO O','Kuo Terminal','Lakon Type 7'
 'SKEGGIKO O','Kuo Terminal','Sidewinder'
 'SKEGGIKO O','Kuo Terminal','Viper'
+'SOCH','Whitcomb Ring','Sidewinder'
+'SOCH','Whitcomb Ring','Clipper'
+'SOCH','Whitcomb Ring','Python'
+'SOCH','Whitcomb Ring','Viper'
+'SOCH','Whitcomb Ring','Cobra'
+'SOCH','Whitcomb Ring','Lakon Type 6'
+'SOCH','Whitcomb Ring','Lakon Type 9'
+'SOCH','Whitcomb Ring','Orca'
+'SOCH','Whitcomb Ring','Lakon Type 7'
+'SOCH','Whitcomb Ring','Hauler'
+'SOCH','Whitcomb Ring','Eagle'
+'SOCH','Whitcomb Ring','Adder'
 'SOL','Columbus','Adder'
 'SOL','Columbus','Hauler'
 'SOL','Columbus','Lakon Type 6'
diff --git a/data/Station.csv b/data/Station.csv
index c1e288d4..ac60f30c 100644
--- a/data/Station.csv
+++ b/data/Station.csv
@@ -92,14 +92,15 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'AC +26 37030','Kimbrough Settlement',1497,'?','?'
 'ACAMAR','I Sola Platform',5000,'N','M'
 'ACHENAR','Baker Terminal',20000,'N','L'
-'ACHENAR','Bell Terminal',0,'?','L'
+'ACHENAR','Bell Terminal',20808,'N','L'
 'ACHENAR','Dawes Hub',20000,'N','L'
-'ACHENAR','Jones Dock',0,'?','?'
-'ACHENAR','Kagawa Station',0,'?','?'
-'ACHENAR','MacMillan Terminal',0,'?','L'
-'ACHENAR','Peters City',0,'?','?'
-'ACHENAR','Wilson Vision',0,'?','?'
-'ACIHAUT','Cuffey Plant',0,'?','?'
+'ACHENAR','Jones Dock',2335,'?','M'
+'ACHENAR','Kagawa Station',119251,'?','M'
+'ACHENAR','MacMillan Terminal',20808,'N','L'
+'ACHENAR','Peters City',42365,'?','M'
+'ACHENAR','Wilson Vision',12555,'?','M'
+'ACIHAUT','Cuffey Plant',473,'Y','L'
+'ACIHAUT','Mastracchio Base',473,'N','L'
 'ACKWADA','Birminghamport',0,'?','?'
 'ACKWADA','Carter Hanger',0,'?','?'
 'ACKWADA','MacVicar Port',0,'?','?'
@@ -114,8 +115,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'ADRIATIKURU','Menzies Gateway',0,'?','?'
 'ADRIATIKURU','Morrow Gateway',0,'?','?'
 'ADRIATIKURU','Oliver Market',145,'?','?'
-'AE FORNACIS','Avogadro Hub',0,'?','?'
-'AE FORNACIS','Deb Colony',0,'?','?'
+'AE FORNACIS','Avogadro Hub',0,'?','M'
+'AE FORNACIS','Deb Colony',0,'?','L'
 'AEGAEON','Schweickart Station',0,'?','?'
 'AEQUEELG','Hopkins Plant',1756,'Y','M'
 'AEQUEELG','Robinson Station',19,'N','M'
@@ -132,7 +133,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'AGARLA','Wilson Port',67,'N','L'
 'AGASTANI','Battuta Dock',0,'?','?'
 'AGASTANI','Bell Terminal',0,'?','?'
-'AGASTANI','Leslie City',0,'?','?'
+'AGASTANI','Leslie City',995,'?','?'
 'AGASTANI','Vesalius Terminal',0,'?','?'
 'AGASTJA','Leiber Port',1640,'N','M'
 'AGASTJA','Ziemianski Ring',930,'Y','L'
@@ -157,9 +158,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'AKUALANU','Hughes Vista',81,'?','L'
 'AL MINA','Dana Port',0,'?','?'
 'ALACAGUI','Husband Refinery',0,'N','?'
-'ALACARAKMO','Julian Survey',0,'?','?'
-'ALACARAKMO','Vlamingh Port',0,'?','?'
-'ALACARAKMO','Weyl Gateway',0,'?','?'
+'ALACARAKMO','Julian Survey',0,'?','M'
+'ALACARAKMO','Vlamingh Port',0,'?','M'
+'ALACARAKMO','Weyl Gateway',15,'Y','L'
 'ALBANGAIT','Lee Orbital',1103,'?','L'
 'ALBANGAIT','Qureshi Terminal',8548,'?','M'
 'ALBANGAIT','Van Houten Gateway',1392,'?','M'
@@ -190,13 +191,13 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'ALIOTH','Irkutsk',7783,'Y','L'
 'ALIOTH','Laird Dock',0,'?','M'
 'ALIOTH','Melbourne Park',7783,'?','L'
-'ALIT','Albitzky Market',0,'?','?'
-'ALIT','Bond Port',0,'?','?'
-'ALIT','Morrow Station',0,'?','?'
-'ALIT','Otomo Port',0,'?','?'
-'ALIT','Rittenhouse Dock',0,'?','?'
-'ALIT','Rosse Terminal',0,'?','?'
-'ALIT','Webb Port',0,'?','?'
+'ALIT','Albitzky Market',348,'N','L'
+'ALIT','Bond Port',61,'Y','M'
+'ALIT','Morrow Station',194,'N','M'
+'ALIT','Otomo Port',103,'?','M'
+'ALIT','Rittenhouse Dock',587,'N','L'
+'ALIT','Rosse Terminal',104,'N','M'
+'ALIT','Webb Port',194,'N','M'
 'ALLOWAIR','Skripochka Survey',0,'?','?'
 'ALPHA CENTAURI','Al-Din Prospect',0,'?','M'
 'ALPHA CENTAURI','Hutton Orbital',6937920,'?','M'
@@ -229,8 +230,11 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'ANARUWA','Fermi Prospect',0,'?','L'
 'ANARUWA','Skvortsov Mines',550,'Y','L'
 'ANCALUFON','Feoktistov Orbital',349,'Y','L'
-'ANCANEC','Watts Horizons',0,'?','?'
+'ANCANEC','Watts Horizons',377,'N','L'
 'ANDERE','Conklin Ring',0,'?','?'
+'ANDHI','Ejeta Gateway',311,'Y','L'
+'ANDHI','Hale Station',171,'?','M'
+'ANDHI','Meikle City',98,'N','M'
 'ANDHRIMI','Ansari Terminal',53,'Y','M'
 'ANDHRIMI','Fullerton Port',0,'?','M'
 'ANDHRIMI','Yurchikhin Station',17,'Y','L'
@@ -334,6 +338,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'ATLANTIS','Ayers City',0,'?','?'
 'ATLANTIS','Bliss Vision',0,'?','?'
 'ATLANTIS','Kimura Terminal',4100,'?','L'
+'ATTACH','Otiman Terminal',1407,'N','?'
 'ATUM','Bottego Hub',59288,'N','M'
 'ATUM','Leckie City',59710,'Y','M'
 'AUDHR','Blackwell Port',40,'Y','L'
@@ -343,7 +348,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'AULENDIAE','Drew Colony',11413,'?','M'
 'AULIN','Aulin Enterprise',111,'N','L'
 'AULIN','Edwards Ring',334,'N','M'
-'AULIN','Kuo City',0,'?','?'
+'AULIN','Kuo City',62,'?','?'
 'AULIS','Dezhurov Gateway',0,'?','?'
 'AUTAHENETSI','Artyukhin Ring',0,'N','L'
 'AWANG','Clark Holdings',554,'Y','M'
@@ -402,6 +407,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'BD+01 3657','Sacco Base',350,'?','?'
 'BD+03 1552','Bailey Station',0,'?','?'
 'BD+03 1552','Narita Ring',0,'?','?'
+'BD+07 4267','Rorschach Survey',4747,'N','?'
 'BD+08 1303','Chomsky Ring',0,'?','?'
 'BD+08 1303','Wescott Terminal',0,'?','?'
 'BD+11 2853','Ostwald Base',3595,'Y','M'
@@ -414,7 +420,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'BD+19 2511','Lie Terminal',0,'?','?'
 'BD+23 3151','Bamford Ring',0,'?','?'
 'BD+23 3151','Houssay Port',0,'?','?'
-'BD+23 3151','McCoy Terminal',272,'Y','M'
+'BD+23 3151','Mccoy Terminal',272,'Y','M'
 'BD+24 1451','Marshburn Terminal',0,'?','?'
 'BD+29 2405','Benyovszky Station',0,'?','?'
 'BD+29 2405','Markham Hub',0,'?','?'
@@ -437,6 +443,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'BD+43 2989','Read Hub',1400,'?','?'
 'BD+43 2989','Schirra Station',1000,'?','?'
 'BD+47 2112','Olivas Settlement',0,'?','?'
+'BD+47 2112','Orsini Mining Platform',216,'Y','L'
 'BD+49 1280','Archimedes City',0,'?','?'
 'BD+49 1280','Higginbotham Dock',103,'Y','L'
 'BD+49 1280','Laplace Orbital',0,'?','?'
@@ -445,6 +452,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'BD+55 1519','Eskridge Orbital',0,'?','?'
 'BD+55 1519','Schirra Port',856,'Y','M'
 'BD+65 1846','Shargin Beacon',0,'?','?'
+'BD+65 626','Chalker Dock',8555,'Y','M'
 'BD+71 1033','Fourneyron Port',0,'?','?'
 'BD+74 526','Smith Prospect',0,'?','?'
 'BD+75 58','Stephenson Station',0,'?','?'
@@ -527,7 +535,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'BOBADZIHOZO','Barr Refinery',404,'N','M'
 'BOBADZIHOZO','Bolkow Colony',577,'N','M'
 'BODB DEARG','Farghani Prospect',0,'?','?'
-'BODB DEARG','Qushji Landing',0,'?','?'
+'BODB DEARG','Qushji Landing',12,'N','L'
 'BODB DJEDI','Chwedyk Station',1812,'Y','L'
 'BOGATIKU','Rotsler Enterprise',0,'?','?'
 'BOLG','Moxon''s Mojo',0,'?','?'
@@ -620,6 +628,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'CD-35 9019','Liwei Orbital',8082,'Y','L'
 'CD-35 9019','Scobee Terminal',544,'?','L'
 'CD-35 9019','Wright City',332,'?','L'
+'CD-40 395','Merritt Dock',0,'?','?'
+'CD-40 395','Oort Port',0,'?','?'
 'CD-46 12902','Searfoss Orbital',160,'Y','?'
 'CD-51 102','Mcdermott Enterprise',2615,'N','L'
 'CD-52 187','Nojiri Dock',15,'N','L'
@@ -667,8 +677,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'CHANII','Lundwall Hub',0,'?','?'
 'CHAPO','Nachtigal Vision',0,'?','?'
 'CHAPOYO','Piccard Port',0,'?','?'
-'CHAPSUGAI','Shaw Base',0,'?','M'
-'CHAPSUGAI','Zhigang Platform',0,'?','M'
+'CHAPSUGAI','Shaw Base',1128,'?','M'
+'CHAPSUGAI','Zhigang Platform',11,'N','M'
 'CHAPSUGAIBO','Schlesinger City',0,'?','?'
 'CHARA','Reilly Refinery',0,'?','?'
 'CHAXIRAXI','Brother''s Progress',0,'?','?'
@@ -912,7 +922,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'ENEK','Carr Station',0,'?','?'
 'ENEK','Milnor Port',0,'?','?'
 'EPSILON CETI','Hennen Orbital',0,'?','L'
-'EPSILON CYGNI','Grant Terminal',0,'?','?'
+'EPSILON CYGNI','Grant Terminal',2480,'Y','?'
 'EPSILON ERIDANI','Darkes High',0,'?','L'
 'EPSILON ERIDANI','Davies Station',281,'N','L'
 'EPSILON ERIDANI','Fortress Cousens',0,'N','L'
@@ -1009,15 +1019,15 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'FU HUANGAA','Williams Landing',327,'Y','M'
 'FUELUM','Thesiger Enterprise',62,'Y','M'
 'FUJIN','Futen Spaceport',0,'?','L'
-'FULAR','Kotov Orbital',0,'?','?'
+'FULAR','Kotov Orbital',0,'N','L'
 'FURBAIDE','Effinger Port',2062,'Y','L'
 'FUTENO','Haipeng Ring',0,'?','?'
 'FUTENO','Hermaszewski Installation',0,'?','?'
-'FUTENO','McCandless Prospect',0,'?','?'
+'FUTENO','Mccandless Prospect',0,'?','?'
 'G 121-8','Brosnan Gateway',0,'?','?'
 'G 122-60','Vancouver Gateway',1203,'Y','M'
 'G 122-60','Watts Enterprise',716,'Y','L'
-'G 123-16','Anthony de la Roche Gateway',0,'?','?'
+'G 123-16','Anthony de La Roche Gateway',0,'?','?'
 'G 123-16','Shiner Station',95,'Y','L'
 'G 123-49','Herreshoff Freeport',6,'Y','M'
 'G 123-49','Jet-Gang',0,'?','?'
@@ -1038,7 +1048,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'G 180-18','Alexandria Gateway',0,'?','?'
 'G 180-18','Bamford Terminal',0,'?','?'
 'G 180-18','Hale Port',0,'?','?'
-'G 180-47','McCulley Hub',2,'Y','M'
+'G 180-47','Mcculley Hub',2,'Y','M'
 'G 181-6','Thomas Installation',0,'?','?'
 'G 188-9','Tanner Dock',966,'Y','M'
 'G 203-47','Cabana Market',12,'Y','L'
@@ -1274,6 +1284,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'HIP 27986','Webb Port',0,'?','?'
 'HIP 41181','Andersson Station',0,'?','L'
 'HIP 41181','Garcia Port',0,'?','L'
+'HIP 41955','Lukyanenko Platform',23,'Y','M'
+'HIP 41955','Nixon Landing',23,'N','M'
 'HIP 4907','Edison Platform',0,'?','?'
 'HIP 59533','Burnham Beacon',0,'?','L'
 'HIP 60679','Cady Enterprise',2455,'Y','L'
@@ -1334,13 +1346,14 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'HOLVAIT','Nikolayev Hanger',0,'?','?'
 'HORAE','Haber Hub',4668,'Y','?'
 'HORAE','McDivitt Dock',7961,'Y','?'
-'HR 1254','Ellis Orbital',0,'?','?'
-'HR 1254','Ivanishin City',0,'?','?'
-'HR 1254','Klimuk City',0,'?','?'
-'HR 1254','Linteris Enterprise',0,'?','?'
-'HR 1254','Potrykus Market',0,'?','?'
-'HR 1257','Jacobi Platform',0,'?','?'
+'HR 1254','Ellis Orbital',1264,'?','?'
+'HR 1254','Ivanishin City',2160,'?','?'
+'HR 1254','Klimuk City',302,'?','?'
+'HR 1254','Linteris Enterprise',1681,'?','?'
+'HR 1254','Potrykus Market',967,'?','?'
+'HR 1257','Jacobi Platform',194,'N','L'
 'HR 1257','Millar Settlement',0,'?','?'
+'HR 1257','Miller Settlement',358,'N','M'
 'HR 2848','Zander Hub',0,'?','?'
 'HR 2883','Neumann Enterprise',275,'Y','M'
 'HR 3991','Greenland Exchange',0,'?','?'
@@ -1448,6 +1461,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'JUKU','Ings Colony',710,'?','M'
 'JULANGGARRI','Willis City',0,'?','?'
 'JUMUZGO','Artsutanov Station',0,'?','?'
+'JURA','Baynes Terminal',0,'?','?'
+'JURA','BRORSEN INSTALLATION',0,'?','?'
 'JURU','Bunnel Ring',308,'Y','L'
 'JURU','Gunn Terminal',429,'N','M'
 'K CAMELOPARDALIS','Anning Station',0,'?','?'
@@ -1467,6 +1482,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'KADU MIST','Yolen Gateway',631,'Y','L'
 'KAHA''I','Bohm Station',0,'?','?'
 'KAIAKUL','Barlowe Station',580,'?','L'
+'KAITSAN','Guidoni Legacy',797,'Y','M'
+'KAITSAN','McCulley Relay',797,'N','M'
 'KALIKI','Kaluta Prospect',1683,'?','M'
 'KALIKI','Oren City',21,'?','L'
 'KALIKI','Trimble Station',1172,'?','M'
@@ -1474,6 +1491,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'KALUMAR','Andreas Ring',388,'Y','L'
 'KAMAKI','Kojima Gateway',2519,'Y','M'
 'KAMBAIAMBO','Vonarburg Platform',0,'?','?'
+'KAMCHA','Reeves Hub',0,'?','?'
 'KAMCHATA','Krikalev Gateway',0,'?','?'
 'KAMCHATA','Schweickart Enterprise',0,'?','?'
 'KAMCHATA','Tuan Platform',0,'?','?'
@@ -1520,7 +1538,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'KELTIM','Shea City',55,'?','M'
 'KELTIM','Sitterly Orbital',30,'N','L'
 'KELTIM','Tomita Hub',354,'?','M'
-'KERIES','Derrickson''s Escape',0,'?','?'
+'KERIES','Derrickson''s Escape',252,'Y','L'
 'KHANCI','Bloomfield Colony',0,'?','?'
 'KHANCI','Tani Colony',0,'?','?'
 'KHERNIDJAL','Brooks Enterprise',584,'?','?'
@@ -1737,7 +1755,14 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'LHS 140','Mondeh Station',15,'?','M'
 'LHS 140','Onizuka Orbital',0,'?','?'
 'LHS 140','Pippin City',32,'?','M'
+'LHS 142','Belyayev Port',28,'N','M'
+'LHS 142','Grandin Dock',2034,'N','M'
+'LHS 142','Haignere Station',3042,'N','?'
 'LHS 142','Kozeyev Orbital',45,'Y','L'
+'LHS 142','Noriega Port',9,'N','L'
+'LHS 142','Vo Dock',10,'Y','L'
+'LHS 142','Watson Station',12,'Y','L'
+'LHS 142','Weitz Port',1200,'Y','S'
 'LHS 1446','Blalock Orbital',4144,'N','L'
 'LHS 1663','Bulychev Holdings',0,'?','?'
 'LHS 1663','Frobisher City',0,'?','?'
@@ -1818,7 +1843,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'LHS 2887','Massimino Dock',0,'?','?'
 'LHS 2936','Ferguson Relay',0,'?','?'
 'LHS 295','White Settlement',0,'?','?'
-'LHS 3006','WCM Transfer Orbital',0,'?','?'
+'LHS 3006','Frimout Legacy',452,'Y','M'
+'LHS 3006','WCM Transfer Orbital',65,'Y','L'
 'LHS 3057','Wallace Colony',0,'?','?'
 'LHS 3197','Szilard Orbital',97,'?','?'
 'LHS 3262','Lacaille Prospect',0,'?','?'
@@ -1934,7 +1960,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'LONG','Grushin Prospect',0,'?','?'
 'LOPU MARIS','Garan Settlement',0,'?','?'
 'LOPU MARIS','Messerschmid Outpost',0,'?','?'
-'LOUGUALA','McMullen City',2,'Y','L'
+'LOUGUALA','Mcmullen City',2,'Y','L'
 'LOVEDU','Novitski Point',1214,'Y','M'
 'LP 102-320','Shepard Hub',0,'?','?'
 'LP 128-9','Bridges Terminal',0,'?','?'
@@ -2032,6 +2058,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'LP 908-11','So-Yeon City',0,'?','?'
 'LP 926-40','Lee City',0,'?','?'
 'LP 933-24','Alfven Platform',13,'N','M'
+'LP 940-115','May City',0,'?','?'
 'LP 98-132','Freeport',0,'?','?'
 'LP DRACONIS','McDivitt Settlement',0,'?','?'
 'LPM 26','Hirn Prospect',1250,'N','M'
@@ -2074,6 +2101,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'LTT 15574','Haxel Port',603,'Y','L'
 'LTT 15574','Yaping Dock',1297,'N','M'
 'LTT 1572','Young Dock',0,'?','?'
+'LTT 1581','Keyes Retreat',341,'Y','M'
 'LTT 1582','Pimi Ring',0,'?','?'
 'LTT 15899','Kekule Orbital',0,'?','?'
 'LTT 15899','Onufriyenko Station',0,'?','?'
@@ -2133,7 +2161,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'LTT 5212','Harrison Hub',25,'?','M'
 'LTT 5455','Blaha Legacy',0,'?','?'
 'LTT 5623','Vries City',61,'Y','M'
-'LTT 6137','MacKellar Gateway',2936,'Y','L'
+'LTT 6137','Mackellar Gateway',2936,'Y','L'
 'LTT 7421','Eudoxus Dock',0,'?','?'
 'LTT 7421','Fancher Ring',1291,'?','?'
 'LTT 7421','Lukyanenko Vision',0,'?','?'
@@ -2149,7 +2177,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'LTT 9455','Shaikh Horizons',0,'?','M'
 'LTT 9795','Smith Port',2437,'Y','L'
 'LTT 9810','Gutierrez Terminal',0,'?','L'
-'LTT 9810','Kerimov Dock',0,'N','L'
+'LTT 9810','Kerimov Dock',60,'N','L'
 'LTT 9810','Lopez Terminal',0,'?','L'
 'LTT 9810','Minkowski Orbital',0,'?','L'
 'LTT 9810','Trimble Vision',187,'N','M'
@@ -2185,7 +2213,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'LWEN','Oliver Enterprise',0,'?','L'
 'LWEN','Phillips Terminal',2000,'Y','M'
 'MABE','Cummings Port',0,'?','?'
-'MABE','McMullen Port',2334,'Y','M'
+'MABE','Mcmullen Port',2334,'Y','M'
 'MAC OG','Amis Dock',106,'Y','L'
 'MAC OG','Harness Dock',150,'Y','M'
 'MACHATKWA','Ikeya Orbital',657,'N','L'
@@ -2371,7 +2399,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'NANDJABINJA','Brand City',0,'?','?'
 'NANDJALATO','Dorsett Colony',984,'N','M'
 'NANDJALATO','Tereshkova Colony',759,'N','M'
-'NANG TA-KHIAN','Hay Point',0,'?','?'
+'NANG TA-KHIAN','Hadwell Orbital',392,'Y','L'
+'NANG TA-KHIAN','Hay Point',392,'N','L'
 'NANGKANO','Sarafanov Hub',0,'?','?'
 'NANOMAM','Gresley Dock',398,'Y','L'
 'NARASIMHA','Mendel Survey',2480,'Y','S'
@@ -2420,11 +2449,11 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'NLTT 11599','Babakin Terminal',0,'?','?'
 'NLTT 11599','Janjetov City',0,'?','?'
 'NLTT 11599','Tombaugh Port',0,'?','?'
-'NLTT 12130','Hodgkinson Colony',0,'?','?'
-'NLTT 12130','Rolland Settlement',0,'?','?'
-'NLTT 34715','McAllaster Terminal',854,'Y','L'
+'NLTT 12130','Hodgkinson Colony',115075,'?','?'
+'NLTT 12130','Rolland Settlement',115645,'?','?'
+'NLTT 34715','Mcallaster Terminal',854,'Y','L'
 'NLTT 34715','Mouhot Orbital',1125,'Y','M'
-'NLTT 36689','Francisco De Eliza Enterprise',1357,'Y','L'
+'NLTT 36689','Francisco de Eliza Enterprise',1357,'Y','L'
 'NLTT 38960','Sarafanov Orbital',0,'?','?'
 'NLTT 45576','Kadenyuk Outpost',1166,'Y','M'
 'NLTT 45576','Vo Refinery',0,'?','?'
@@ -2459,8 +2488,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'NU GORYNI','Fraser Holdings',0,'?','M'
 'NU GORYNI','Tavernier Works',1697,'?','M'
 'NU INDI','Shatalov Colony',281,'Y','M'
-'NU TAURI','Faraday Dock',0,'?','?'
-'NU TAURI','Parmitano Terminal',0,'?','?'
+'NU TAURI','Faraday Dock',1124,'?','?'
+'NU TAURI','Parmitano Terminal',405,'?','?'
 'NU-2 LUPI','Gauss City',0,'?','?'
 'NU-2 LUPI','Pudwill Gorie Holdings',0,'?','?'
 'NUAKEA','Oblivion',1183,'Y','L'
@@ -2480,7 +2509,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'NUT','Babcock Gateway',25,'N','L'
 'NUT','Shavyrin Station',99,'N','M'
 'NYAL','Chadwick Colony',0,'?','?'
-'NYANKTONA','MacKellar Dock',0,'?','?'
+'NYANKTONA','Mackellar Dock',0,'?','?'
 'NYANKTONA','Midgeley Hub',0,'?','?'
 'NYIKAMANA','Mourelle Prospect',42,'Y','M'
 'NZAMBASSEE','Arnarson Ring',353,'N','L'
@@ -2538,7 +2567,13 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'OPALA','Onizuka''s Hold',70,'N','L'
 'OPALA','Romanenko Estate',0,'?','L'
 'OPALA','Zamka Platform',0,'?','?'
-'OPILA','Temple Dock',0,'?','?'
+'OPILA','Al-Khayyam Ring',292,'Y','M'
+'OPILA','Baird Orbital',56,'N','M'
+'OPILA','Hayden Gateway',56,'?','L'
+'OPILA','Kennedy Port',31,'?','L'
+'OPILA','Kube-McDowell City',92,'Y','L'
+'OPILA','Peirce Orbital',2129,'N','M'
+'OPILA','Temple Dock',33,'?','L'
 'ORANNIKA','Hildebrandt City',420,'N','L'
 'ORANNIKA','Kagawa Dock',0,'?','?'
 'ORANNIKA','Melotte Gateway',0,'?','?'
@@ -2663,6 +2698,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'QUECHE','Rutherford Works',0,'?','?'
 'QUECHUA','Crown Ring',120,'N','L'
 'QUINESS','Lockyer''s Rest',0,'?','?'
+'QUIVIRA','Brendan Gateway',0,'?','?'
+'QUIVIRA','Godel Dock',0,'?','?'
 'RA','Coelho Ring',0,'?','?'
 'RA','Ellison Orbital',0,'?','L'
 'RA','Kazantsev Dock',0,'?','L'
@@ -2688,8 +2725,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'RAJIE','Stanley Platform',29,'?','M'
 'RAJUKRU','Kerwin Station',0,'?','?'
 'RAJUKRU','Snyder Terminal',117,'Y','L'
-'RAKAPILA','Stone Enterprise',0,'?','?'
-'RAKAPILA','Walker Settlement',0,'?','?'
+'RAKAPILA','Stone Enterprise',41,'Y','L'
+'RAKAPILA','Walker Settlement',1227,'N','M'
 'RAKSAKA','Trevithick Port',0,'?','?'
 'RANA','Ali Hub',670,'Y','L'
 'RANGCHAN','Boole Ring',0,'?','?'
@@ -2864,7 +2901,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'SHANHAULS','Forward Gateway',474,'Y','L'
 'SHANHAULS','Lowry City',283,'Y','L'
 'SHAPSUGABUS','Abe Dock',0,'?','L'
-'SHAPSUGABUS','Balog Dock',0,'?','?'
+'SHAPSUGABUS','Balog Dock',30,'N','L'
 'SHAPSUGABUS','Biermann Station',0,'?','L'
 'SHAPSUGABUS','Lee Station',55,'N','L'
 'SHAPSUGABUS','Luther Terminal',0,'?','M'
@@ -2944,7 +2981,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'SOWIIO','Bigourdan Ring',0,'Y','L'
 'SOWIIO','Cassini Hub',0,'Y','L'
 'SOWIIO','Shaw Port',0,'?','?'
-'SPOCS 208','Thomas Hub',0,'?','?'
+'SPOCS 208','Thomas Hub',141,'N','L'
 'STEIN 2051','Boming Station',1798,'N','M'
 'STEIN 2051','Rennie Landing',168,'N','M'
 'STEIN 2051','Trevithick Port',0,'?','?'
@@ -3101,7 +3138,8 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'TIGUAI','Pippin Port',0,'?','?'
 'TIGUE','Ehrenfried Kegel Landing',963,'?','M'
 'TIGUE','McDevitt Vision',666,'?','M'
-'TILIAN','Maunder''s Hope',0,'?','?'
+'TILIAN','Keeler Rest',180,'N','L'
+'TILIAN','Maunder''s Hope',180,'Y','L'
 'TIMBALDERIS','McKay Terminal',0,'?','?'
 'TIMOCANI','Pennington Terminal',0,'?','?'
 'TIMOCANI','Seega Port',0,'?','?'
@@ -3150,7 +3188,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'TUN','Tun''s Wart',0,'?','?'
 'TURDETANI','Popov Colony',5533,'Y','M'
 'TURDETANI','Rushworth Port',0,'?','?'
-'TURIR','Brooks Terminal',0,'?','?'
+'TURIR','Brooks Terminal',42,'N','L'
 'TURMO','Tokubei Prospect',0,'?','?'
 'TURMO','Vancouver''s Inheritance',0,'?','?'
 'TURNAT','Cenker Orbital',0,'?','M'
@@ -3314,6 +3352,7 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'WITCHHAUL','Hornby Terminal',0,'?','L'
 'WODIMUI','Bruce Mine',0,'?','?'
 'WODIMUI','Laird Platform',0,'?','?'
+'WOGAMA','Veach Terminal',12555,'Y','?'
 'WOLF 10','Townshend Orbital',1201,'N','?'
 'WOLF 1301','Denton Installation',0,'?','?'
 'WOLF 1301','Menezes Installation',0,'?','?'
@@ -3374,8 +3413,9 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size
 'WUTHIELO KU','Robert Dock',0,'?','L'
 'WUTHIELO KU','Tarter Dock',145,'N','L'
 'WX URSAE MAJORIS','Teng-Hui Terminal',0,'?','?'
-'WYRD','Bokeili Station',0,'?','?'
-'WYRD','Vonarburg Co-Operative',0,'?','?'
+'WYRD','Bokeili Station',861,'N','L'
+'WYRD','Gareth Edwards Park',861,'Y','L'
+'WYRD','Vonarburg Co-Operative',161,'Y','L'
 'XI URSAE MAJORIS','Joule Settlement',0,'?','?'
 'XI WANGKALA','Ross Colony',0,'?','?'
 'XIHE','Zhen Dock',1940,'?','?'
diff --git a/misc/madupload.py b/misc/madupload.py
old mode 100644
new mode 100755
index 3bf97595..f37066a1
--- a/misc/madupload.py
+++ b/misc/madupload.py
@@ -3,6 +3,7 @@
 import pathlib
 import platform
 import re
+import sys
 
 try:
     import requests
@@ -35,6 +36,8 @@
 
 upload_url = 'http://www.davek.com.au/td/uploaddata.asp'
 upfile = "updated.prices"
+if len(sys.argv) > 1:
+    upfile = sys.argv[1]
 
 
 ############################################################################
@@ -49,8 +52,8 @@
         upload_url,
         files={
             'Filename': (
-                'updated.prices',
-                open('updated.prices', 'rb'),
+                upfile,
+                open(upfile, 'rb'),
                 'text/plain',
                 {
                     "Expires": '300',