diff --git a/README.txt b/README.txt
index 7c855808..6cc2255e 100644
--- a/README.txt
+++ b/README.txt
@@ -1,802 +1,804 @@
-==============================================================================
-TradeDangerous
-Copyright (C) Oliver "kfsone" Smith, July 2014
-REQUIRES PYTHON 3.0 OR HIGHER.
-==============================================================================
-
-== What is Trade Dangerous?
-==============================================================================
-
-TradeDangerous is a cargo run optimizer for Elite: Dangerous that calculates
-everything from simple one-jump stops between stations to calculating complex
-multi-stop routes with light-year, jumps-per-stop, and all sorts of other
-things.
-
-For multi-stop routes, it takes into account the money you are making and
-factors that into the shopping for each subsequent hop.
-
-TradeDangerous data is manually entered: The tool provides an easy editor
-for correcting prices at a given station, but you can also retrieve ".prices"
-files from other commanders to fill out your database.
-
-
-== CHANGE LOG
-==============================================================================
-
-CAUTION: So many systems changed with the Beta 3 update that old prices files
-won't stand a chance of containing many valid systems. You may want to obtain
-a fresh file from one of the online sources, e.g.
-maddavo's site: http://www.davek.com.au/td/default.asp
-
-v5.0.1 Nov 4/2014
-. (kfsone) Issue #49 Errors in Ambiguity Error
-. (kfsone) Issue #51 L and ? items weren't honoring qty limits
-. (kfsone) Issue #50 Interaction between -0 and demand for a sold item
-. (Smacker65) Beta 3 Systems with markets
-
-v5.0.0 Oct 31/2014
-. (kfsone) Initial Beta 3 changes
- - Improved the "corrections" system which facilitates changing names
-   between versions, you can now "correct" System, Station, Category
-   and Item names;
- - Renamed "Drugs" to "Legal Drugs", guess we need to add "Illegal Drugs"
- - Renamed some obvious items (Hel-Static Furnaces -> Microbial Furnaces),
- - Added some items that looked new (but could be renames),
- - Renamed Hopkins Hangar -> Cori Terminal
-
-v4.7.0 Oct 26/2014
-. (kfsone) Added "buy" sub-command for looking up sales of an item
-
-v4.6.3 Oct 26/2014
-. (kfsone) Fixed distance-related breakage in 4.6.2
-. (kfsone) Improved error feedback while processing .prices file
-
-v4.6.2 Oct 25/2014
-. (kfsone) Added support for self-correcting star/station name changes,
-. (kfsone) Added name corrections for maddavo's current TradeDangerous.prices,
-. (kfsone) Assorted minor API changes,
-. (kfsone) Minor startup optimization pass
-
-v4.6.1 Oct 25/2014
-. (kfsone) Added "--supply" (-S) which shows supply (demand and stock) fields when editing,
-. (kfsone) Added "--timestamps" (-T) which shows timestamp field when editing,
-. (kfsone) Added "--force-na" (-0) which replaces 'unk' values with 'n/a' (use with care),
-. (kfsone) Deprecated "--all" and "--zero",
-. (kfsone) Minor fixes to new .prices format
-
-v4.6.0 Oct 24/2014
-. (kfsone) New extended .prices format:
-  <item name> <sell> <buy> <demand> <stock> [<time>]
-  Demand/stock can be:
-   unk     :-  "unknown" - treat as though always available
-   n/a     :-  "not available" - ignore in trade calcs
-   0       :-  alias for "n/a"
-  or the number of units followed by L, M or H, e.g.
-   10L     :- 10 units at Low
-   500M    :- 500 units at Medium
-   9000H   :- 9000 units at High
-  Note that the time has moved to the end of the line.
-  When updating data, you can either remove the time and have it
-  default to 'now' or you can explicitly write the word now.
-. (smacker65) Couple of station name corrections
-. (kfsone) Better feedback when price data could not be found
-. (kfsone) .prices wiki page
-. (smacker65) More star data and corrections
-. (gazelle) Fix for "--zero" and, e.g., "-1L0"
-
-v4.5.1 Oct 20/2014
-. (kfsone) Added --dir (-C) command line for specifying which directory you
-  want trade.py to look in for it's files.
-. (kfsone) trade.py will now default to trying to look for files relative
-  to where the "trade.py" script was called from. So if you run
-  "c:\tradedangerous\trade.py" it will look for the data directory as
-  "c:\tradedangerous\data\" (Issue #39)
-
-v4.5.0 Oct 20/2014
-. (Smacker65/Community) Smacker brings the star database up to 567 systems.
-
-v4.4.0 Oct 19/2014
-. (Gazelle/Community) Merged Gazelle's update with community sources Star/Station
-  data. Thanks to Gazelle, Smacker, RedWizzard, Haringer, Wolverine.
-  It's only data but it's a big update and a lot of work went into it :)
-
-(See end of file for older changes)
-
-
-==============================================================================
-== TRADE DANGEROUS: USAGE
-==============================================================================
-
-Lets start with a fully fleshed out example command line and then I'll walk
-you through some simpler cases.
-
-  I have a Lakon Type 6 and 50,000 credits. I want to keep 20,000 credits
-  aside for insurance incase bad things happen. My ship is kitted out so
-  it is limited to 12 light year jumps, but I'll try 3 jumps between each
-  station. I don't like the long drive to Anderson's escape so don't go
-  there, and I want to avoid Gold because it's usually scarce.
-
-  I have a mission at Cuffey and I want to finish at Aulin to outfit.
-
-  Plan me a route from Chango with 6 stops to make money.
-
-  Show me the route in detail, walk me through each step and put the
-  instructions for the current step on the multi-function display of my
-  X52 throttle...
-
-  trade.py --detail --detail --detail run --ship type6 --credits 50000 --insurance 20000 --ly-per 12 --jumps 3 --avoid anderson --avoid gold --via cuffey --to aulin --from chango --hops 6 --checklist --x52-pro
-or
-  trade.py -vvv run --sh type6 --cr 50000 --ins 20000 --ly 12 --ju 3 --av anderson,gold --via cuffey --to aulin --fr chango --hops 6 --check --x52
-
-Lets dial it back and start with something simpler:
-
-You're sitting in a hauler at Chango with 20,000 credits and you have time
-for 2 hops, you might run it like this:
-
- C:\TradeDangerous\> trade.py run --ship hauler --from Chango --credits 20000
-
-The 'run' keyword indicates you want to calculate a trade run. Trade tries to
-be flexible, so you could shorten this down to:
-
-  trade.py --sh hauler --fr chan --cr 20000
-
-And the output might look like this:
-
-    I BOOTIS Chango -> DAHAN Gateway:
-     >-> I BOOTIS Chango      Buy 16*Fish (389cr),
-     -+- LHS3006 WCM          Buy 13*Bertrandite (1871cr), 3*Lepidolite (323cr),
-     <-< DAHAN Gateway gaining 13806cr => 33806cr total
-
-The route goes from Chango to Gateway via LHS 3006. At Chango, you pick up 16
-fish at 389 credits each. Fly to LHS 3006 and dock at WCM and sell your fish,
-and pick up 13 Bertrandite and 3 units of Lepidolite. Set sail for Gateway in
-Dahan ... and profit.
-
-To the tune of 13,806cr.
-
-If you leave out the '--from' option, TradeDangerous will do the same
-calculation for every station in the database and tell you where the best
-possible 2-hop run is:
-
- C:\TradeDangerous\> trade.py run --ship hauler --credits 20000
-    ACIHAUT Cuffey -> DAHAN Gateway:
-     >-> ACIHAUT Cuffey       Buy 16*Lithium (1129cr),
-     -+- AULIN Enterprise     Buy 13*Combat Stabilisers (2179cr), 3*Synthetic Meat (87cr),
-     <-< DAHAN Gateway gaining 20035cr => 40035cr total
-
-By starting from Cuffey and making our way to Gateway, we'd make 2,000 credits
-more.
-
-But how was it expecting us to get from Cuffey to Aulin? For this, there is
-the --detail option. This is one of the options common to all commands, and
-so it has to be specified before the command. It can be abbreviated "-v"
-(think: verbose)
-
- C:\TradeDangerous\> trade.py --detail run --ship hauler --credits 20000
-    ACIHAUT Cuffey -> DAHAN Gateway:
-     >-> ACIHAUT Cuffey       Buy 16*Lithium (1129cr),
-       |   Acihaut -> LHS3006 -> Aulin
-     -+- AULIN Enterprise     Buy 13*Combat Stabilisers (2179cr), 3*Synthetic Meat (87cr),
-       |   Aulin -> Eranin -> Dahan
-     <-< DAHAN Gateway gaining 20035cr => 40035cr total
-
-The route starts at Cuffey station in Acihaut. Then you jump to LHS 3006 and
-then Aulin, where you dock at Enterprise. Then you jump from Aulin to Eranin
-and finally to Dahan to dock at Gateway.
-
-I use the term "hop" to describe picking up goods at one station, crossing
-systems and docking at another station and selling the goods; the term "jump"
-to describe a hyperspace trip between two individual star systems.
-
-One problem:
-
-The hauler can't make the above journey with cargo and weapons.
-
-The "--ly-per" argument (or it's --ly abbreviation) lets us tell TD to limit
-connections to a max jump distance, in this case of 5.2ly. Note that this
-time I'm using "-v" as a short-cut for "--detail"
-
- C:\TradeDangerous\> trade.py -v run --ship hauler --credits 20000 --ly-per 5.2
-     >-> MORGOR Romaneks      Buy 14*Gallite (1376cr),
-       |   Morgor -> Dahan -> Asellus
-     -+- ASELLUS Beagle2      Buy 13*Advanced Catalysts (2160cr), 2*H.E. Suits (115cr), 1*Scrap (34cr),
-       |   Asellus -> Dahan
-     <-< DAHAN Gateway gaining 18640cr => 38640cr total
-
-Maybe you don't want to make multiple jumps between systems? Use the "--jumps"
-switch to lower or increase the number of jumps between systems on each hop:
-
-  C:\TradeDangerous\> trade.py -v run --ship hauler --credits 20000 --jumps 1
-    ERANIN Azeban -> DAHAN Gateway:
-     >-> ERANIN Azeban        Buy 16*Coffee (1092cr),
-       |   Eranin -> Asellus
-     -+- ASELLUS Beagle2      Buy 11*Advanced Catalysts (2160cr), 5*H.E. Suits (115cr),
-       |   Asellus -> Dahan
-     <-< DAHAN Gateway gaining 13870cr => 33870cr total
-
-TD also takes a "--insurance" option which tells it to put some money aside
-for insurance payments. This lets you put the actual amount of credits you
-have without having to remember to subtract your insurance each time.
-
-
-==============================================================================
-== COMMAND LINE OPTIONS
-==============================================================================
-
-trade.py is a front-end to several tools - a trade run calculator, a tool for
-updating prices at a given station, and more to come.
-
-You can type "trade.py -h" for basic usage, or for help on a specific sub-
-command, you can use "trade.py command -h" for example
-
-  trade.py run -h
-
-will show you how to use the 'run' sub-command.
-
-Common Options:
-  These can be used with any command, so they must be specified before the
-  command itself.
-
-     --detail
-     -v
-       Increases the amount of detail given when showing routes or running the
-       checklist system. Each use increases the detail, i.e. "-v -v" will
-       give you more detail than just "-v". Short version stacks, e.g.
-       "-v -v -v" is the same as "-vvv"
-
-     --quiet
-     -q
-       Reduces the verbosity of the program. For example,
-         trade.py -qq cleanup
-       Will run the command with no output unless an error occurs.
-       NOTE: --detail and --quiet are mutually exclusive.
-
-     --debug
-     -w
-       Gives some additional information on what TD is doing while running,
-       each use increases the verbosity: i.e. --debug --debug is more verbose.
-       Short version is stackable, e.g. "-w -w -w" or "-www"
-
-Sub Commands:
-  trade.py run ...
-    Calculates a trade run.
-
-  trade.py update ...
-    Provides an interface for updating the prices at a station.
-
-
-RUN sub-command:
-
-  This command provides the primary trade run calculator functionality (it provides
-  the functionality of the older TradeDangerous versions prior to 3.1)
-
-   Route options:
-     --from <station or system>
-       Lets you specify the starting station
-       e.g.
-         --from Dahan
-         --from Gateway
-
-     --to <station or system>
-       Lets you specify the final destination
-       e.g.
-         --to Beagle2
-         --to Aulin
-
-     --via <station or system>
-       Lets you specify a station that must be between the second and final hop.
-       Requires that hops be at least 2.
-       e.g.
-         --via Enterprise
-         --via Chango
-
-     --unique
-     --uni
-       Only show routes which do not visit any station twice
-
-     --hops N
-       DEFAULT: 2
-       Maximum number of hops (number of cargo pickups)
-       e.g.
-         --hops 8
-
-     --jumps-per N
-     --jum N
-       DEFAULT: 2
-       Limit the number of systems jumped to between each station
-       e.g.
-         -jumps-per 5
-
-     --ly-per N.NN
-     --ly N.NN
-       DEFAULT: based on --ship
-       Maximum distance your ship can jump between systems at full capacity.
-       NOTE: You can increase your range by selling your weapons.
-       e.g.
-         --ly-per 19.1
-         --ly-per 3
-
-   Ship/Trade options:
-     --capacity N
-     --cap N
-       DEFAULT: based on --ship
-       Maximum items you can carry on each hop.
-   
-     --credits N
-     --cr N
-       How many credits to start with
-       e.g.
-         --credits 20000
-
-     --insurance N   DEFAULT: 0
-     --ins N
-       How many credits to hold back for insurance purposes
-       e.g.
-         --insurance 1000
-         --ins 5000
-
-     --limit N   DEFAULT: 0
-       If set, limits the maximum number of units of any cargo
-       item you will buy on any trade hop, incase you want to
-       hedge your bets or be a good economy citizen.
-       e.g.
-         --capacity 16 --limit 8
-
-     --avoid ITEM/SYSTEM/STATION
-     --avoid AVOID,AVOID,...,AVOID
-     --av ITEM/SYSTEM/STATION
-     --av AVOID,AVOID,...,AVOID
-       Excludes the item/system/station matching the name from the database
-       e.g.
-         --avoid Gold
-         --avoid Aulin
-         --avoid Enterprise
-         --avoid prise
-         --av gold,aulin,enterprise,anderson
-
-     --margin N.NN   DEFAULT: 0.01
-       At the end of each hop, reduce the profit by this much (0.02 = 2%),
-       to allow a margin of error in the accuracy of prices.
-       e.g.
-         --margin 0      (no margin)
-         --margin 0.01   (1% margin)
-   
-   Other options:
-     --routes N   DEFAULT: 1
-       Shows the top N routes; 
-
-     --checklist
-     --check
-       Walks you through the purchases, sales and jumps of your route.
-       Note: More verbose when used with --detail
-
-     --x52-pro
-     --x52
-       OMFG Output the current step of the checklist on your X52 Pro MFD.
-       Is that some sweetness or what?
-
-UPDATE sub-command:
-
-  For maintenance on your local prices database. The default is to walk
-  you through a list of all the prices known for the station. You can either
-  hit enter or type the correction.
-
-  Alternatively, if you specify one of the editing switches, it will put
-  the prices for a given station into a text file and let you edit it
-  with your favorite editor.
-
-  trade.py update
-
-    --editor <executable name or path>
-      e.g. --editor "C:\Program Files\WibbleEdit\WibbleEdit.exe"
-      Saves the prices in a human-readable format and loads that into
-      an editor. Make changes and save to update the database.
-
-    --supply
-    -S
-      Exposes the "demand" and "stock" columns.
-
-    --timestamps
-    -T
-      Exposes the "timestamp" column.
-
-    --force-na
-    -0
-      Changes the default demand/stock to be "n/a".
-      CAUTION: "n/a" indicates that the item is either not bought
-      or not sold at this station, and TD will ignore it accordingly.
-
-    --sublime
-    --subl
-      Like "--editor" but finds and uses the Sublime Text editor (2 and 3).
-      You can use "--editor" to tell it exactly where the editor
-      is located if it fails to find it.
-
-    --notepad
-    --note
-      Like "--editor" but uses notepad as the editor.
-
-    --npp
-      Like "--editor" but tries to use Notepad++ as the editor.
-      NOTE: You will have to exit notepad++ completely before trade
-      is able to process the changes you have made.
-
-    --vim
-      Like "--editor" but tries to use the VI iMproved editor.
-      Mostly applies to Linux, Mac and Cygwin/Git installs.
-
-  Examples:
-    trade.py update "aulin enterprise" --notepad
-    trade.py update chango --subl --supply
-    trade.py update anderson --editor "C:\Program Files\Microsoft Office\WordPad.exe"
-    trade.py update wcm --timestamps
-    trade.py update --sub --sup --time --zero aulin
-  aka:
-    trade.py update --sub -ST0 aulin
-
-
-BUY sub-command:
-
-  Looks for stations selling the specified item: that means they have a non-zero
-  asking price and a stock level other than "n/a".
-
-  trade.py [-q | -q] buy [--quantity Q] [--near N] [--ly-per N] item [-P | -S]
-
-    --quantity Q
-      Requires that the stock level be unknown or at least this value,
-      --quantity 23
-
-    --near system
-    --near station
-      Only considers stations within reach of the specified system.
-      --near chango
-
-    --ly-per N.N
-      Sets the range of --near (requires --near)
-      --near chango --ly 10
-
-    --prices-sort
-    -P
-      Keeps items sorted by price when using --near
-      (otherwise items are listed by distance and then price)
-
-    --stock-sort
-    -S
-      Sorts items by stock available first and then price
-
-
-NAV sub-command:
-
-  Provides details of routes without worrying about trade. By default, if
-  given a ship, it uses the max dry range of the ship. Use --full if you
-  want to restrict to routes with a full cargo hold.
-
-  trade.py [-q | -v] nav [--ship name [--full]] [--ly-per] from to
-
-    --ship name
-      Uses the values for an empty ship to constrain jump ranges,
-      --ship=ana
-      --ship type6
-      --ship 6
-
-    --full
-      Used with --ship, uses the max range of the ship with a full load,
-      --ship cobra --full
-
-    --ly-per N.NN
-      Constrains jumps to a maximum ly distance
-      --ly-per 3.2
-
-    from
-      Name of the starting system or a station in the system,
-
-    to
-      Name of the destination system or a station in the system,
-
-  Examples:
-    > trade.py nav --ship=type6 5287 2887
-    From LHS 5287 to LHS 2887 with 29.36ly per jump limit.
-    System                         (Jump Ly)
-    ----------------------------------------
-    LHS 5287                       (   0.00)
-    I BOOTIS                       (  19.94)
-    LHS 2887                       (  17.14)
-
-    > trade.py -v nav --ship=type6 --full 5287 2887
-    From LHS 5287 to LHS 2887 with 15.64ly per jump limit.
-    Action | System                         | Jump Ly | Total Ly
-    ------------------------------------------------------------
-    Depart | LHS 5287                       |    0.00 |     0.00
-    Via    | ASELLUS PRIMUS                 |   14.47 |    14.47
-    Via    | BD+47 2112                     |   11.81 |    26.28
-    Arrive | LHS 2887                       |   11.73 |    38.01
-
-LOCAL sub-command:
-
-  Provides details of local stations without worrying about trade. By default, if
-  given a ship, it uses the max dry range of the ship. Use --full if you
-  want to restrict to systems with a full cargo hold.
-
-  trade.py [-q | -v] local [--ship name [--full]] [--ly N.NN] [--pill | --percent] system
-
-    --ship name
-      Uses the values for an empty ship to constrain jump ranges,
-      --ship=ana
-      --ship type6
-      --ship 6
-
-    --full
-      Used with --ship, uses the max range of the ship with a full load,
-      --ship cobra --full
-
-    --ly N.NN
-      Constrains local systems to a maximum ly distance
-      --ly 20.0
-    
-    --pill
-      Show estimated length along the Pill in ly
-
-    --percent
-      Like --pill but shows percentage instead
-
-    -v
-      Show stations
-      
-    system
-      Name of the system or a station in the system,
-
-  Examples:
-    > trade.py local --ly 11.0 dahan
-    Local systems to DAHAN within 11.0 ly.
-	--------------------------------------
-	 4.66 Asellus Primus
-	 5.12 Morgor
-	 6.41 Eranin
-	 8.26 Meliae
-	 8.58 LHS 2884
-	 8.60 LP 98-132
-	 9.20 Aulis
-	 9.75 GD 319
-	10.08 BD+47 2112
-	10.33 i Bootis
-    
-    > trade.py -v local --ly 11.0 sur
-    Local systems to SURYA within 11.0 ly.
-    --------------------------------------
-     9.22 [  2.2] 14 Herculis
-     9.23 [  1.0] Vaccimici
-     9.35 [ 10.0] CM Draco
-    10.59 [ 10.3] V1090 Herculis
-    10.69 [ -1.6] Chi Herculis
-    
-    > trade.py -vv local --ly 10.0 3006
-    Local systems to LHS 3006 within 10.0 ly.
-    -----------------------------------------
-     5.64 [  0.4] Acihaut
-          <Cuffey Plant>
-          <Mastracchio Base>
-     6.00 [  5.1] G 239-25
-          <Bresnik Mine>
-     6.47 [  1.1] Nang Ta-khian
-          <Hay Point>
-          <Hadwell Orbital>
-     7.51 [ -0.0] Eranin
-          <Azeban City>
-          <Azeban Orbital>
-          <Eranin 4 Survey>
-     7.74 [ -4.9] Aulin
-          <Aulin Enterprise>
-          <Harbaugh Station>
-          <Onufrienko Station>
-     8.12 [ -2.8] i Bootis
-          <Chango Dock>
-          <Maher Stellar Research>
-     8.52 [ -6.4] BD+47 2112
-          <Olivas Settlement>
-     8.78 [  7.9] Lalande 29917
-     9.40 [  5.7] DN Draconis
-     9.72 [  4.9] LP 98-132
-          <Freeport>
-          <Prospect Five>
-
-==============================================================================
-== ADDING OR CHANGING PRICE DATA
-==============================================================================
-
-TradeDangerous uses a human-readable text format for price information. This
-is designed to closely resemble what we see in the market screens in-game.
-
-To edit the data for a single station, use the "update" sub-command, e.g.
-
-  trade.py update --notepad Aulin
-
-This will open notepad with the data for Aulin, which will look something like:
-
-  @ AULIN/Aulin Enterprise
-     + Chemicals
-        Explosives                 50      0
-        Hydrogen Fuels             19      0
-        Mineral Oil               100      0
-        Pesticides                 21      0
-     + Consumer Items
-        Clothing                  300      0
-        Consumer Tech            1112   1111
-
-"@" lines specify a system/station.
-"+" lines specify a category.
-The remaining lines are items.
-
-  Explosives    50    0
-
-These fields are:
-  <item name>
-  <sale price> (how much the station pays)
-  <buying price> (how much the station charges)
-
-So you can see the only item this station is selling is Consumer Tech, which 
-the station wants 1111 credits for.
-
-TradeDangerous can also leverage the "DEMAND" and "STOCK" values from the
-market UI. To expose those when using "trade.py update", use the "--all"
-option. For more details of the extended format, see the Prices wiki page:
-https://bitbucket.org/kfsone/tradedangerous/wiki/Price%20Data
-
-NOTE: The order items are listed within their category is saved between edits,
-so if you switch "Explosives" and "Hydrogen Fuels" and then save it, they
-will show that way when you edit this station again.
-
-See "trade.py update -h" for more help with the update command.
-
-Note: My personal editor of choice is "Sublime Text", which is why there is
-a command line option (--sublime or just --subl) for invoking it.
-
-
-==============================================================================
-== That's nice, but I'm a programmer and I want to ...
-==============================================================================
-
-Yeah, let me stop you there. 
-
-    from tradedb import *
-    from tradecalc import *
-
-    tdb = TradeDB()
-    calc = TradeCalc(tdb, capacity=16, margin=0.01, unique=False)
-
-Whatever it is you want to do, you can do from there.
-
-See "cli.py" for examples.
-
-== Change Log Archive
-==============================================================================
-
-v4.3.0 Oct 17/2014
-. (gazelle) Added "--zero" option to "update --all" which makes the default
-   value for demand/stock levels "0" instead of "-1". (-1 means 'unknown'.
-   Use this option if you are editing timestamps and stock levels and all
-   those '-'s get in your way)
-. (gazelle) Moved Star, System, etc data out of ".sql" file and into
-   per-table ".csv" files. This should make it much easier for people to
-   share and synchronize data and make it less daunting for people to
-   maintain their data files. Great work, Gazelle!
-
-v4.2.3 Oct 17/2014
-. (ShadowGar, Smacker65) Imported Harbinger and RedWizzard system data,
-  also added tracking of where data has come from. Thanks also to Wolverine
-  for his work identifying data sources.
-
-v4.2.2 Oct 16/2014
-. (kfsone) user-friendlified errors generated by TD
-. (kfsone) gave "update" sub-command a "--npp" option (notepad++)
-. (kfsone) gave "update" sub-command a "--vim" option (vim editor)
-
-v4.2.1 Oct 15/2014
-. (ShadowGar) Added more Stars and corrected HAGALAZ
-. (kfsone) sort items by name rather than id when building .prices files
-. (kfsone) improved the instructional comments in .prices files
-. (kfsone) Big README.txt cleanup
-
-v4.2.0 Oct 15/2014
-. (Smacker65) Added "local" sub-command (lists systems within jump range of you)
-
-v4.1.0 Oct 15/2014
-. (gazelle) ".prices" file is no-longer included in the git repository,
-  instead you'll need to download one or populate your own
-. (gazelle) added the "--all" option to the "update" sub-command,
-. (kfsone) fixed problems caused when the .prices file is missing and there is
-  limited or no data available - user should get better feedback now.
-
-v4.0.4 Oct 15/2014
-. (kfsone) Issue #20 Improved fuzzy-matching of system/star names
-. (gazelle) Fixed "Lacaille Prospect"
-. (kfsone) "trade.py" is now executable by default on Linux/MacOS
-
-v4.0.3 Oct 12/2014
-. (kfsone) Issue #17 "--avoid gold" conflicted with "Goldstein Mines"
-. (Smacker65) Issue #13 "Nelson Port" was listed as "Nelson Point"
-. (kfsone) Issue #12 "-w" was failing because Rigel has no links
-. (kfsone) Issue #11 Partial name matches weren't generating an ambiguity (e.g. 'ra' or 'ross')
-. (kfsone) Issue #19 Beryllium and Gallium were incorrectly identified as Minerals
-
-v4.0.2 Oct 06/2014
-. (ShadowGar) More systems/stations from
-
-v4.0.1 Oct 06/2014
-. (kfsone)  Improved "--sublime" option, now supports Sublime Text 2 and works under Mac/Lin
-
-v4.0 Oct 05/2014
-. (ShadowGar) Updated to Beta 2 - All credit to ShadowGar
-
-v3.9 Sep 21/2014
-  NOTE: '--detail' (-v) is now a common option, i.e. must come before sub-command
-    trade.py cleanup -v    << won't work any more
-    trade.py -v cleanup    << new order
-  Added 'nav' sub-command for navigation assistance:
-    trade.py nav [--ship name [--full]] [--ly-per] from to
-  Added '--quiet' (-q) common option for reducing level of detail, e.g.
-    trade.py -q cleanup
-
-v3.8 Sep 17/2014
-  Fix for Issue #7: --avoid not working with systems that have no stations,
-  Additional help text,
-  General cleanup,
-  Running "emdn-tap.py -v" will show price changes,
-
-v3.7 Sep 15/2014
-  Fixed excessive CPU usage in emdn-tap.py (ty, jojje)
-  Added 'cleanup' command to help remove bad data from emdn
-    EMDN isn't foolproof, and sometimes receives invalid or
-    deliberately poisoned data. The best way to detect this
-    is currently to look for prices that are somewhat older
-    than the rest of the information received for the same
-    station. This command checks for those records and
-    removes them.
-  emdn-tap now tries harder to honor commit intervals.
-API Changes:
-  makeSubParser now takes an epilog  
-
-v3.6 Sep 12/2014
-  Added DB support for tracking item stock/demand levels,
-  TradeCalc will now factor stock levels when present,
-  Minor performance/memory tweak
-  emdn-tap:
-    Now accepts --warn-to argument,
-    Applies filters to what data it will accept,
-    Records item stock/demand levels to the DB
-
-v3.5 Sep 06/2014
-  The emdn-tap tool now uses the compressed JSON stream rather than
-  the CSV stream - saves you bandwidth.
-
-v3.4 Sep 05/2014
-  Added emdn-tap.py script which pulls data from EMDN network.
-  "--via" now accepts multiple and/or comma separated stations so you can plan
-  a very specific shopping-list route.
-
-v3.3 Sep 04/2014
-  Updated README to include sub-commands,
-  Fixed a 'file not found' error running trade.py the first time with no arguments,
-  Made specific CATEGORY/Item lookups possible (e.g. "Metals/Gold"),
-  Added games internal names for items to the database,
-  Enabled internal-name lookups for items (e.g. 'heliostaticfurnaces'),
-  Fixed a bug where two names for the same thing caused ambiguity (duh!),
-API changes:
-  TradeDB.listSearch() now also takes a val() argument,
-  Added a simple EMDN access module (emdn directory),
-  Cleaned up various __repr__ functions now I know what __repr__ is for,
-
-v3.2 Sep 03/2014
-  Internal cleanup of how we process sub-commands
-
-v3.1 Sep 01/2014
-  Introduced sub-commands:
-  - "run" command provides the old default behavior of calculating a run,
-  - "update" command provides ways to update price database easily,
-
-v3.0 Aug 30/2014
-  Major overhaul. No-longer requires Microsoft Access DB. To update prices,
-  edit the data/TradeDangerous.prices file. When you next run the tool, new
-  data will be loaded automatically.
-  Cleaned up code, normalized the way I name functions, etc.
-  Added more ship data, etc.
-
+==============================================================================
+TradeDangerous
+Copyright (C) Oliver "kfsone" Smith, July 2014
+REQUIRES PYTHON 3.0 OR HIGHER.
+==============================================================================
+
+== What is Trade Dangerous?
+==============================================================================
+
+TradeDangerous is a cargo run optimizer for Elite: Dangerous that calculates
+everything from simple one-jump stops between stations to calculating complex
+multi-stop routes with light-year, jumps-per-stop, and all sorts of other
+things.
+
+For multi-stop routes, it takes into account the money you are making and
+factors that into the shopping for each subsequent hop.
+
+TradeDangerous data is manually entered: The tool provides an easy editor
+for correcting prices at a given station, but you can also retrieve ".prices"
+files from other commanders to fill out your database.
+
+
+== CHANGE LOG
+==============================================================================
+
+CAUTION: So many systems changed with the Beta 3 update that old prices files
+won't stand a chance of containing many valid systems. You may want to obtain
+a fresh file from one of the online sources, e.g.
+maddavo's site: http://www.davek.com.au/td/default.asp
+
+v5.0.2 Nov 11/2014
+. (smacker65) Merged in more systems from Slopey
+
+v5.0.1 Nov 4/2014
+. (kfsone) Issue #49 Errors in Ambiguity Error
+. (kfsone) Issue #51 L and ? items weren't honoring qty limits
+. (kfsone) Issue #50 Interaction between -0 and demand for a sold item
+. (Smacker65) Beta 3 Systems with markets
+
+v5.0.0 Oct 31/2014
+. (kfsone) Initial Beta 3 changes
+ - Improved the "corrections" system which facilitates changing names
+   between versions, you can now "correct" System, Station, Category
+   and Item names;
+ - Renamed "Drugs" to "Legal Drugs", guess we need to add "Illegal Drugs"
+ - Renamed some obvious items (Hel-Static Furnaces -> Microbial Furnaces),
+ - Added some items that looked new (but could be renames),
+ - Renamed Hopkins Hangar -> Cori Terminal
+
+v4.7.0 Oct 26/2014
+. (kfsone) Added "buy" sub-command for looking up sales of an item
+
+v4.6.3 Oct 26/2014
+. (kfsone) Fixed distance-related breakage in 4.6.2
+. (kfsone) Improved error feedback while processing .prices file
+
+v4.6.2 Oct 25/2014
+. (kfsone) Added support for self-correcting star/station name changes,
+. (kfsone) Added name corrections for maddavo's current TradeDangerous.prices,
+. (kfsone) Assorted minor API changes,
+. (kfsone) Minor startup optimization pass
+
+v4.6.1 Oct 25/2014
+. (kfsone) Added "--supply" (-S) which shows supply (demand and stock) fields when editing,
+. (kfsone) Added "--timestamps" (-T) which shows timestamp field when editing,
+. (kfsone) Added "--force-na" (-0) which replaces 'unk' values with 'n/a' (use with care),
+. (kfsone) Deprecated "--all" and "--zero",
+. (kfsone) Minor fixes to new .prices format
+
+v4.6.0 Oct 24/2014
+. (kfsone) New extended .prices format:
+  <item name> <sell> <buy> <demand> <stock> [<time>]
+  Demand/stock can be:
+   unk     :-  "unknown" - treat as though always available
+   n/a     :-  "not available" - ignore in trade calcs
+   0       :-  alias for "n/a"
+  or the number of units followed by L, M or H, e.g.
+   10L     :- 10 units at Low
+   500M    :- 500 units at Medium
+   9000H   :- 9000 units at High
+  Note that the time has moved to the end of the line.
+  When updating data, you can either remove the time and have it
+  default to 'now' or you can explicitly write the word now.
+. (smacker65) Couple of station name corrections
+. (kfsone) Better feedback when price data could not be found
+. (kfsone) .prices wiki page
+. (smacker65) More star data and corrections
+. (gazelle) Fix for "--zero" and, e.g., "-1L0"
+
+v4.5.1 Oct 20/2014
+. (kfsone) Added --dir (-C) command line for specifying which directory you
+  want trade.py to look in for it's files.
+. (kfsone) trade.py will now default to trying to look for files relative
+  to where the "trade.py" script was called from. So if you run
+  "c:\tradedangerous\trade.py" it will look for the data directory as
+  "c:\tradedangerous\data\" (Issue #39)
+
+v4.5.0 Oct 20/2014
+. (Smacker65/Community) Smacker brings the star database up to 567 systems.
+
+v4.4.0 Oct 19/2014
+. (Gazelle/Community) Merged Gazelle's update with community sources Star/Station
+  data. Thanks to Gazelle, Smacker, RedWizzard, Haringer, Wolverine.
+  It's only data but it's a big update and a lot of work went into it :)
+
+(See end of file for older changes)
+
+
+==============================================================================
+== TRADE DANGEROUS: USAGE
+==============================================================================
+
+Lets start with a fully fleshed out example command line and then I'll walk
+you through some simpler cases.
+
+  I have a Lakon Type 6 and 50,000 credits. I want to keep 20,000 credits
+  aside for insurance incase bad things happen. My ship is kitted out so
+  it is limited to 12 light year jumps, but I'll try 3 jumps between each
+  station. I don't like the long drive to Anderson's escape so don't go
+  there, and I want to avoid Gold because it's usually scarce.
+
+  I have a mission at Cuffey and I want to finish at Aulin to outfit.
+
+  Plan me a route from Chango with 6 stops to make money.
+
+  Show me the route in detail, walk me through each step and put the
+  instructions for the current step on the multi-function display of my
+  X52 throttle...
+
+  trade.py --detail --detail --detail run --ship type6 --credits 50000 --insurance 20000 --ly-per 12 --jumps 3 --avoid anderson --avoid gold --via cuffey --to aulin --from chango --hops 6 --checklist --x52-pro
+or
+  trade.py -vvv run --sh type6 --cr 50000 --ins 20000 --ly 12 --ju 3 --av anderson,gold --via cuffey --to aulin --fr chango --hops 6 --check --x52
+
+Lets dial it back and start with something simpler:
+
+You're sitting in a hauler at Chango with 20,000 credits and you have time
+for 2 hops, you might run it like this:
+
+ C:\TradeDangerous\> trade.py run --ship hauler --from Chango --credits 20000
+
+The 'run' keyword indicates you want to calculate a trade run. Trade tries to
+be flexible, so you could shorten this down to:
+
+  trade.py --sh hauler --fr chan --cr 20000
+
+And the output might look like this:
+
+    I BOOTIS Chango -> DAHAN Gateway:
+     >-> I BOOTIS Chango      Buy 16*Fish (389cr),
+     -+- LHS3006 WCM          Buy 13*Bertrandite (1871cr), 3*Lepidolite (323cr),
+     <-< DAHAN Gateway gaining 13806cr => 33806cr total
+
+The route goes from Chango to Gateway via LHS 3006. At Chango, you pick up 16
+fish at 389 credits each. Fly to LHS 3006 and dock at WCM and sell your fish,
+and pick up 13 Bertrandite and 3 units of Lepidolite. Set sail for Gateway in
+Dahan ... and profit.
+
+To the tune of 13,806cr.
+
+If you leave out the '--from' option, TradeDangerous will do the same
+calculation for every station in the database and tell you where the best
+possible 2-hop run is:
+
+ C:\TradeDangerous\> trade.py run --ship hauler --credits 20000
+    ACIHAUT Cuffey -> DAHAN Gateway:
+     >-> ACIHAUT Cuffey       Buy 16*Lithium (1129cr),
+     -+- AULIN Enterprise     Buy 13*Combat Stabilisers (2179cr), 3*Synthetic Meat (87cr),
+     <-< DAHAN Gateway gaining 20035cr => 40035cr total
+
+By starting from Cuffey and making our way to Gateway, we'd make 2,000 credits
+more.
+
+But how was it expecting us to get from Cuffey to Aulin? For this, there is
+the --detail option. This is one of the options common to all commands, and
+so it has to be specified before the command. It can be abbreviated "-v"
+(think: verbose)
+
+ C:\TradeDangerous\> trade.py --detail run --ship hauler --credits 20000
+    ACIHAUT Cuffey -> DAHAN Gateway:
+     >-> ACIHAUT Cuffey       Buy 16*Lithium (1129cr),
+       |   Acihaut -> LHS3006 -> Aulin
+     -+- AULIN Enterprise     Buy 13*Combat Stabilisers (2179cr), 3*Synthetic Meat (87cr),
+       |   Aulin -> Eranin -> Dahan
+     <-< DAHAN Gateway gaining 20035cr => 40035cr total
+
+The route starts at Cuffey station in Acihaut. Then you jump to LHS 3006 and
+then Aulin, where you dock at Enterprise. Then you jump from Aulin to Eranin
+and finally to Dahan to dock at Gateway.
+
+I use the term "hop" to describe picking up goods at one station, crossing
+systems and docking at another station and selling the goods; the term "jump"
+to describe a hyperspace trip between two individual star systems.
+
+One problem:
+
+The hauler can't make the above journey with cargo and weapons.
+
+The "--ly-per" argument (or it's --ly abbreviation) lets us tell TD to limit
+connections to a max jump distance, in this case of 5.2ly. Note that this
+time I'm using "-v" as a short-cut for "--detail"
+
+ C:\TradeDangerous\> trade.py -v run --ship hauler --credits 20000 --ly-per 5.2
+     >-> MORGOR Romaneks      Buy 14*Gallite (1376cr),
+       |   Morgor -> Dahan -> Asellus
+     -+- ASELLUS Beagle2      Buy 13*Advanced Catalysts (2160cr), 2*H.E. Suits (115cr), 1*Scrap (34cr),
+       |   Asellus -> Dahan
+     <-< DAHAN Gateway gaining 18640cr => 38640cr total
+
+Maybe you don't want to make multiple jumps between systems? Use the "--jumps"
+switch to lower or increase the number of jumps between systems on each hop:
+
+  C:\TradeDangerous\> trade.py -v run --ship hauler --credits 20000 --jumps 1
+    ERANIN Azeban -> DAHAN Gateway:
+     >-> ERANIN Azeban        Buy 16*Coffee (1092cr),
+       |   Eranin -> Asellus
+     -+- ASELLUS Beagle2      Buy 11*Advanced Catalysts (2160cr), 5*H.E. Suits (115cr),
+       |   Asellus -> Dahan
+     <-< DAHAN Gateway gaining 13870cr => 33870cr total
+
+TD also takes a "--insurance" option which tells it to put some money aside
+for insurance payments. This lets you put the actual amount of credits you
+have without having to remember to subtract your insurance each time.
+
+
+==============================================================================
+== COMMAND LINE OPTIONS
+==============================================================================
+
+trade.py is a front-end to several tools - a trade run calculator, a tool for
+updating prices at a given station, and more to come.
+
+You can type "trade.py -h" for basic usage, or for help on a specific sub-
+command, you can use "trade.py command -h" for example
+
+  trade.py run -h
+
+will show you how to use the 'run' sub-command.
+
+Common Options:
+  These can be used with any command, so they must be specified before the
+  command itself.
+
+     --detail
+     -v
+       Increases the amount of detail given when showing routes or running the
+       checklist system. Each use increases the detail, i.e. "-v -v" will
+       give you more detail than just "-v". Short version stacks, e.g.
+       "-v -v -v" is the same as "-vvv"
+
+     --quiet
+     -q
+       Reduces the verbosity of the program. For example,
+         trade.py -qq cleanup
+       Will run the command with no output unless an error occurs.
+       NOTE: --detail and --quiet are mutually exclusive.
+
+     --debug
+     -w
+       Gives some additional information on what TD is doing while running,
+       each use increases the verbosity: i.e. --debug --debug is more verbose.
+       Short version is stackable, e.g. "-w -w -w" or "-www"
+
+Sub Commands:
+  trade.py run ...
+    Calculates a trade run.
+
+  trade.py update ...
+    Provides an interface for updating the prices at a station.
+
+
+RUN sub-command:
+
+  This command provides the primary trade run calculator functionality (it provides
+  the functionality of the older TradeDangerous versions prior to 3.1)
+
+   Route options:
+     --from <station or system>
+       Lets you specify the starting station
+       e.g.
+         --from Dahan
+         --from Gateway
+
+     --to <station or system>
+       Lets you specify the final destination
+       e.g.
+         --to Beagle2
+         --to Aulin
+
+     --via <station or system>
+       Lets you specify a station that must be between the second and final hop.
+       Requires that hops be at least 2.
+       e.g.
+         --via Enterprise
+         --via Chango
+
+     --unique
+     --uni
+       Only show routes which do not visit any station twice
+
+     --hops N
+       DEFAULT: 2
+       Maximum number of hops (number of cargo pickups)
+       e.g.
+         --hops 8
+
+     --jumps-per N
+     --jum N
+       DEFAULT: 2
+       Limit the number of systems jumped to between each station
+       e.g.
+         -jumps-per 5
+
+     --ly-per N.NN
+     --ly N.NN
+       DEFAULT: based on --ship
+       Maximum distance your ship can jump between systems at full capacity.
+       NOTE: You can increase your range by selling your weapons.
+       e.g.
+         --ly-per 19.1
+         --ly-per 3
+
+   Ship/Trade options:
+     --capacity N
+     --cap N
+       DEFAULT: based on --ship
+       Maximum items you can carry on each hop.
+   
+     --credits N
+     --cr N
+       How many credits to start with
+       e.g.
+         --credits 20000
+
+     --insurance N   DEFAULT: 0
+     --ins N
+       How many credits to hold back for insurance purposes
+       e.g.
+         --insurance 1000
+         --ins 5000
+
+     --limit N   DEFAULT: 0
+       If set, limits the maximum number of units of any cargo
+       item you will buy on any trade hop, incase you want to
+       hedge your bets or be a good economy citizen.
+       e.g.
+         --capacity 16 --limit 8
+
+     --avoid ITEM/SYSTEM/STATION
+     --avoid AVOID,AVOID,...,AVOID
+     --av ITEM/SYSTEM/STATION
+     --av AVOID,AVOID,...,AVOID
+       Excludes the item/system/station matching the name from the database
+       e.g.
+         --avoid Gold
+         --avoid Aulin
+         --avoid Enterprise
+         --avoid prise
+         --av gold,aulin,enterprise,anderson
+
+     --margin N.NN   DEFAULT: 0.01
+       At the end of each hop, reduce the profit by this much (0.02 = 2%),
+       to allow a margin of error in the accuracy of prices.
+       e.g.
+         --margin 0      (no margin)
+         --margin 0.01   (1% margin)
+   
+   Other options:
+     --routes N   DEFAULT: 1
+       Shows the top N routes; 
+
+     --checklist
+     --check
+       Walks you through the purchases, sales and jumps of your route.
+       Note: More verbose when used with --detail
+
+     --x52-pro
+     --x52
+       OMFG Output the current step of the checklist on your X52 Pro MFD.
+       Is that some sweetness or what?
+
+UPDATE sub-command:
+
+  For maintenance on your local prices database. The default is to walk
+  you through a list of all the prices known for the station. You can either
+  hit enter or type the correction.
+
+  Alternatively, if you specify one of the editing switches, it will put
+  the prices for a given station into a text file and let you edit it
+  with your favorite editor.
+
+  trade.py update
+
+    --editor <executable name or path>
+      e.g. --editor "C:\Program Files\WibbleEdit\WibbleEdit.exe"
+      Saves the prices in a human-readable format and loads that into
+      an editor. Make changes and save to update the database.
+
+    --supply
+    -S
+      Exposes the "demand" and "stock" columns.
+
+    --timestamps
+    -T
+      Exposes the "timestamp" column.
+
+    --force-na
+    -0
+      Changes the default demand/stock to be "n/a".
+      CAUTION: "n/a" indicates that the item is either not bought
+      or not sold at this station, and TD will ignore it accordingly.
+
+    --sublime
+    --subl
+      Like "--editor" but finds and uses the Sublime Text editor (2 and 3).
+      You can use "--editor" to tell it exactly where the editor
+      is located if it fails to find it.
+
+    --notepad
+    --note
+      Like "--editor" but uses notepad as the editor.
+
+    --npp
+      Like "--editor" but tries to use Notepad++ as the editor.
+      NOTE: You will have to exit notepad++ completely before trade
+      is able to process the changes you have made.
+
+    --vim
+      Like "--editor" but tries to use the VI iMproved editor.
+      Mostly applies to Linux, Mac and Cygwin/Git installs.
+
+  Examples:
+    trade.py update "aulin enterprise" --notepad
+    trade.py update chango --subl --supply
+    trade.py update anderson --editor "C:\Program Files\Microsoft Office\WordPad.exe"
+    trade.py update wcm --timestamps
+    trade.py update --sub --sup --time --zero aulin
+  aka:
+    trade.py update --sub -ST0 aulin
+
+
+BUY sub-command:
+
+  Looks for stations selling the specified item: that means they have a non-zero
+  asking price and a stock level other than "n/a".
+
+  trade.py [-q | -q] buy [--quantity Q] [--near N] [--ly-per N] item [-P | -S]
+
+    --quantity Q
+      Requires that the stock level be unknown or at least this value,
+      --quantity 23
+
+    --near system
+    --near station
+      Only considers stations within reach of the specified system.
+      --near chango
+
+    --ly-per N.N
+      Sets the range of --near (requires --near)
+      --near chango --ly 10
+
+    --prices-sort
+    -P
+      Keeps items sorted by price when using --near
+      (otherwise items are listed by distance and then price)
+
+    --stock-sort
+    -S
+      Sorts items by stock available first and then price
+
+
+NAV sub-command:
+
+  Provides details of routes without worrying about trade. By default, if
+  given a ship, it uses the max dry range of the ship. Use --full if you
+  want to restrict to routes with a full cargo hold.
+
+  trade.py [-q | -v] nav [--ship name [--full]] [--ly-per] from to
+
+    --ship name
+      Uses the values for an empty ship to constrain jump ranges,
+      --ship=ana
+      --ship type6
+      --ship 6
+
+    --full
+      Used with --ship, uses the max range of the ship with a full load,
+      --ship cobra --full
+
+    --ly-per N.NN
+      Constrains jumps to a maximum ly distance
+      --ly-per 3.2
+
+    from
+      Name of the starting system or a station in the system,
+
+    to
+      Name of the destination system or a station in the system,
+
+  Examples:
+    > trade.py nav --ship=type6 5287 2887
+    From LHS 5287 to LHS 2887 with 29.36ly per jump limit.
+    System                         (Jump Ly)
+    ----------------------------------------
+    LHS 5287                       (   0.00)
+    I BOOTIS                       (  19.94)
+    LHS 2887                       (  17.14)
+
+    > trade.py -v nav --ship=type6 --full 5287 2887
+    From LHS 5287 to LHS 2887 with 15.64ly per jump limit.
+    Action | System                         | Jump Ly | Total Ly
+    ------------------------------------------------------------
+    Depart | LHS 5287                       |    0.00 |     0.00
+    Via    | ASELLUS PRIMUS                 |   14.47 |    14.47
+    Via    | BD+47 2112                     |   11.81 |    26.28
+    Arrive | LHS 2887                       |   11.73 |    38.01
+
+LOCAL sub-command:
+
+  Provides details of local stations without worrying about trade. By default, if
+  given a ship, it uses the max dry range of the ship. Use --full if you
+  want to restrict to systems with a full cargo hold.
+
+  trade.py [-q | -v] local [--ship name [--full]] [--ly N.NN] [--pill | --percent] system
+
+    --ship name
+      Uses the values for an empty ship to constrain jump ranges,
+      --ship=ana
+      --ship type6
+      --ship 6
+
+    --full
+      Used with --ship, uses the max range of the ship with a full load,
+      --ship cobra --full
+
+    --ly N.NN
+      Constrains local systems to a maximum ly distance
+      --ly 20.0
+    
+    --pill
+      Show estimated length along the Pill in ly
+
+    --percent
+      Like --pill but shows percentage instead
+
+    -v
+      Show stations
+      
+    system
+      Name of the system or a station in the system,
+
+  Examples:
+    > trade.py local --ly 11.0 dahan
+    Local systems to DAHAN within 11.0 ly.
+	--------------------------------------
+	 4.66 Asellus Primus
+	 5.12 Morgor
+	 6.41 Eranin
+	 8.26 Meliae
+	 8.58 LHS 2884
+	 8.60 LP 98-132
+	 9.20 Aulis
+	 9.75 GD 319
+	10.08 BD+47 2112
+	10.33 i Bootis
+    
+    > trade.py -v local --ly 11.0 sur
+    Local systems to SURYA within 11.0 ly.
+    --------------------------------------
+     9.22 [  2.2] 14 Herculis
+     9.23 [  1.0] Vaccimici
+     9.35 [ 10.0] CM Draco
+    10.59 [ 10.3] V1090 Herculis
+    10.69 [ -1.6] Chi Herculis
+    
+    > trade.py -vv local --ly 10.0 3006
+    Local systems to LHS 3006 within 10.0 ly.
+    -----------------------------------------
+     5.64 [  0.4] Acihaut
+          <Cuffey Plant>
+          <Mastracchio Base>
+     6.00 [  5.1] G 239-25
+          <Bresnik Mine>
+     6.47 [  1.1] Nang Ta-khian
+          <Hay Point>
+          <Hadwell Orbital>
+     7.51 [ -0.0] Eranin
+          <Azeban City>
+          <Azeban Orbital>
+          <Eranin 4 Survey>
+     7.74 [ -4.9] Aulin
+          <Aulin Enterprise>
+          <Harbaugh Station>
+          <Onufrienko Station>
+     8.12 [ -2.8] i Bootis
+          <Chango Dock>
+          <Maher Stellar Research>
+     8.52 [ -6.4] BD+47 2112
+          <Olivas Settlement>
+     8.78 [  7.9] Lalande 29917
+     9.40 [  5.7] DN Draconis
+     9.72 [  4.9] LP 98-132
+          <Freeport>
+          <Prospect Five>
+
+==============================================================================
+== ADDING OR CHANGING PRICE DATA
+==============================================================================
+
+TradeDangerous uses a human-readable text format for price information. This
+is designed to closely resemble what we see in the market screens in-game.
+
+To edit the data for a single station, use the "update" sub-command, e.g.
+
+  trade.py update --notepad Aulin
+
+This will open notepad with the data for Aulin, which will look something like:
+
+  @ AULIN/Aulin Enterprise
+     + Chemicals
+        Explosives                 50      0
+        Hydrogen Fuels             19      0
+        Mineral Oil               100      0
+        Pesticides                 21      0
+     + Consumer Items
+        Clothing                  300      0
+        Consumer Tech            1112   1111
+
+"@" lines specify a system/station.
+"+" lines specify a category.
+The remaining lines are items.
+
+  Explosives    50    0
+
+These fields are:
+  <item name>
+  <sale price> (how much the station pays)
+  <buying price> (how much the station charges)
+
+So you can see the only item this station is selling is Consumer Tech, which 
+the station wants 1111 credits for.
+
+TradeDangerous can also leverage the "DEMAND" and "STOCK" values from the
+market UI. To expose those when using "trade.py update", use the "--all"
+option. For more details of the extended format, see the Prices wiki page:
+https://bitbucket.org/kfsone/tradedangerous/wiki/Price%20Data
+
+NOTE: The order items are listed within their category is saved between edits,
+so if you switch "Explosives" and "Hydrogen Fuels" and then save it, they
+will show that way when you edit this station again.
+
+See "trade.py update -h" for more help with the update command.
+
+Note: My personal editor of choice is "Sublime Text", which is why there is
+a command line option (--sublime or just --subl) for invoking it.
+
+
+==============================================================================
+== That's nice, but I'm a programmer and I want to ...
+==============================================================================
+
+Yeah, let me stop you there. 
+
+    from tradedb import *
+    from tradecalc import *
+
+    tdb = TradeDB()
+    calc = TradeCalc(tdb, capacity=16, margin=0.01, unique=False)
+
+Whatever it is you want to do, you can do from there.
+
+See "cli.py" for examples.
+
+== Change Log Archive
+==============================================================================
+
+v4.3.0 Oct 17/2014
+. (gazelle) Added "--zero" option to "update --all" which makes the default
+   value for demand/stock levels "0" instead of "-1". (-1 means 'unknown'.
+   Use this option if you are editing timestamps and stock levels and all
+   those '-'s get in your way)
+. (gazelle) Moved Star, System, etc data out of ".sql" file and into
+   per-table ".csv" files. This should make it much easier for people to
+   share and synchronize data and make it less daunting for people to
+   maintain their data files. Great work, Gazelle!
+
+v4.2.3 Oct 17/2014
+. (ShadowGar, Smacker65) Imported Harbinger and RedWizzard system data,
+  also added tracking of where data has come from. Thanks also to Wolverine
+  for his work identifying data sources.
+
+v4.2.2 Oct 16/2014
+. (kfsone) user-friendlified errors generated by TD
+. (kfsone) gave "update" sub-command a "--npp" option (notepad++)
+. (kfsone) gave "update" sub-command a "--vim" option (vim editor)
+
+v4.2.1 Oct 15/2014
+. (ShadowGar) Added more Stars and corrected HAGALAZ
+. (kfsone) sort items by name rather than id when building .prices files
+. (kfsone) improved the instructional comments in .prices files
+. (kfsone) Big README.txt cleanup
+
+v4.2.0 Oct 15/2014
+. (Smacker65) Added "local" sub-command (lists systems within jump range of you)
+
+v4.1.0 Oct 15/2014
+. (gazelle) ".prices" file is no-longer included in the git repository,
+  instead you'll need to download one or populate your own
+. (gazelle) added the "--all" option to the "update" sub-command,
+. (kfsone) fixed problems caused when the .prices file is missing and there is
+  limited or no data available - user should get better feedback now.
+
+v4.0.4 Oct 15/2014
+. (kfsone) Issue #20 Improved fuzzy-matching of system/star names
+. (gazelle) Fixed "Lacaille Prospect"
+. (kfsone) "trade.py" is now executable by default on Linux/MacOS
+
+v4.0.3 Oct 12/2014
+. (kfsone) Issue #17 "--avoid gold" conflicted with "Goldstein Mines"
+. (Smacker65) Issue #13 "Nelson Port" was listed as "Nelson Point"
+. (kfsone) Issue #12 "-w" was failing because Rigel has no links
+. (kfsone) Issue #11 Partial name matches weren't generating an ambiguity (e.g. 'ra' or 'ross')
+. (kfsone) Issue #19 Beryllium and Gallium were incorrectly identified as Minerals
+
+v4.0.2 Oct 06/2014
+. (ShadowGar) More systems/stations from
+
+v4.0.1 Oct 06/2014
+. (kfsone)  Improved "--sublime" option, now supports Sublime Text 2 and works under Mac/Lin
+
+v4.0 Oct 05/2014
+. (ShadowGar) Updated to Beta 2 - All credit to ShadowGar
+
+v3.9 Sep 21/2014
+  NOTE: '--detail' (-v) is now a common option, i.e. must come before sub-command
+    trade.py cleanup -v    << won't work any more
+    trade.py -v cleanup    << new order
+  Added 'nav' sub-command for navigation assistance:
+    trade.py nav [--ship name [--full]] [--ly-per] from to
+  Added '--quiet' (-q) common option for reducing level of detail, e.g.
+    trade.py -q cleanup
+
+v3.8 Sep 17/2014
+  Fix for Issue #7: --avoid not working with systems that have no stations,
+  Additional help text,
+  General cleanup,
+  Running "emdn-tap.py -v" will show price changes,
+
+v3.7 Sep 15/2014
+  Fixed excessive CPU usage in emdn-tap.py (ty, jojje)
+  Added 'cleanup' command to help remove bad data from emdn
+    EMDN isn't foolproof, and sometimes receives invalid or
+    deliberately poisoned data. The best way to detect this
+    is currently to look for prices that are somewhat older
+    than the rest of the information received for the same
+    station. This command checks for those records and
+    removes them.
+  emdn-tap now tries harder to honor commit intervals.
+API Changes:
+  makeSubParser now takes an epilog  
+
+v3.6 Sep 12/2014
+  Added DB support for tracking item stock/demand levels,
+  TradeCalc will now factor stock levels when present,
+  Minor performance/memory tweak
+  emdn-tap:
+    Now accepts --warn-to argument,
+    Applies filters to what data it will accept,
+    Records item stock/demand levels to the DB
+
+v3.5 Sep 06/2014
+  The emdn-tap tool now uses the compressed JSON stream rather than
+  the CSV stream - saves you bandwidth.
+
+v3.4 Sep 05/2014
+  Added emdn-tap.py script which pulls data from EMDN network.
+  "--via" now accepts multiple and/or comma separated stations so you can plan
+  a very specific shopping-list route.
+
+v3.3 Sep 04/2014
+  Updated README to include sub-commands,
+  Fixed a 'file not found' error running trade.py the first time with no arguments,
+  Made specific CATEGORY/Item lookups possible (e.g. "Metals/Gold"),
+  Added games internal names for items to the database,
+  Enabled internal-name lookups for items (e.g. 'heliostaticfurnaces'),
+  Fixed a bug where two names for the same thing caused ambiguity (duh!),
+API changes:
+  TradeDB.listSearch() now also takes a val() argument,
+  Added a simple EMDN access module (emdn directory),
+  Cleaned up various __repr__ functions now I know what __repr__ is for,
+
+v3.2 Sep 03/2014
+  Internal cleanup of how we process sub-commands
+
+v3.1 Sep 01/2014
+  Introduced sub-commands:
+  - "run" command provides the old default behavior of calculating a run,
+  - "update" command provides ways to update price database easily,
+
+v3.0 Aug 30/2014
+  Major overhaul. No-longer requires Microsoft Access DB. To update prices,
+  edit the data/TradeDangerous.prices file. When you next run the tool, new
+  data will be loaded automatically.
+  Cleaned up code, normalized the way I name functions, etc.
+  Added more ship data, etc.
\ No newline at end of file
diff --git a/buildcache.py b/buildcache.py
index dfcece7e..f98d9daf 100644
--- a/buildcache.py
+++ b/buildcache.py
@@ -275,7 +275,7 @@ def getSystemByNameIndex(cur):
                       ON System.system_id = Station.system_id
         """)
     return {
-        "{}/{}".format(sysName.upper(), stnName): ID
+        "{}/{}".format(sysName.upper(), stnName.upper()): ID
             for (ID, sysName, stnName)
             in cur
     }
@@ -372,7 +372,7 @@ def genSQLFromPriceLines(priceFile, db, defaultZero, debug=0):
             ### Change current station
             categoryID, uiOrder = None, 0
             systemName, stationName = matches.group(1, 2)
-            facility = systemName.upper() + '/' + stationName
+            facility = systemName.upper() + '/' + stationName.upper()
 
             if debug > 1:
                 print("NEW STATION: {}".format(facility))
@@ -388,7 +388,7 @@ def genSQLFromPriceLines(priceFile, db, defaultZero, debug=0):
                         print("- DELETED: {}".format(facility))
                     stationID = DELETED
                     continue
-                facility = systemName.upper() + '/' + stationName
+                facility = systemName.upper() + '/' + stationName.upper()
                 try:
                     stationID = systemByName[facility]
                     if debug > 1:
@@ -546,6 +546,25 @@ def processPricesFile(db, pricesPath, stationID=None, defaultZero=False, debug=0
 
 ######################################################################
 
+def deprecationCheckSystem(line, debug):
+    correctSystem = corrections.correctSystem(line[0])
+    if correctSystem != line[0]:
+        if debug: print("! System.csv: deprecated system: {}".format(line[0]))
+        line[0] = correctSystem
+
+
+def deprecationCheckStation(line, debug):
+    correctSystem = corrections.correctSystem(line[0])
+    if correctSystem != line[0]:
+        if debug: print("! Station.csv: deprecated system: {}".format(line[0]))
+        line[0] = correctSystem
+
+    correctStation = corrections.correctStation(line[1])
+    if correctStation != line[1]:
+        if debug: print("! Station.csv: deprecated station: {}".format(line[1]))
+        line[1] = correctStation
+
+
 def processImportFile(db, importPath, tableName, debug=0):
     if debug:
         print("* Processing import file '{}' for table '{}'". \
@@ -594,11 +613,18 @@ def processImportFile(db, importPath, tableName, debug=0):
         if debug:
             print("* SQL-Statement: {}".format(sql_stmt))
 
+        # Check if there is a deprecation check for this table.
+        deprecationFn = getattr(sys.modules[__name__],
+                                "deprecationCheck"+tableName,
+                                None)
+
         # import the data
         importCount = 0
         lineNo = 0
+
         for linein in csvin:
             if len(linein) == columnCount:
+                if deprecationFn: deprecationFn(linein, debug)
                 if debug > 1:
                     print("-        Values: {}".format(', '.join(linein)))
                 try:
diff --git a/data/Station.csv b/data/Station.csv
index c8e376cc..dcd5c081 100644
--- a/data/Station.csv
+++ b/data/Station.csv
@@ -1,36 +1,36 @@
 name@System.system_id,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,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,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,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,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,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
+'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,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,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,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,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,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,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,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,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,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,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 130','Ross 130-Station',0.0
-'Ross 210','Ross 210-Station',0.0
+'Ross 128','Warren Prison Mine',0.0
+'Ross 130','Huxley Relay',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,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,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,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,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 52aa11d3..6dd1ec5f 100644
--- a/data/corrections.py
+++ b/data/corrections.py
@@ -8,10 +8,309 @@
 }
 
 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",
+    "37 XI BOOTIS-STATION": "Schirba Plant",
+    "44 CHI DRACONIS-STATION": "Lawson Camp",
+    "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",
+    "BAGA-STATION": "Shipton Exchange",
+    "BAST-STATION": "White Hart Lane",
+    "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",
+    "CR DRACO-STATION": "Strekalov Settlement",
+    "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 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",
+    "LHS 351-STATION": "Brunel Hub",
+    "LHS 3549-STATION": "Baydukov Base",
+    "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 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",
+    "MARASING-STATION": "Thiele Enterprise",
+    "MARKANOMOVOY-STATION": "Compton Dock",
+    "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",
+    "NLTT 46621-STATION": "Hope Point",
+    "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",
+    "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",
+    "PROCYON-STATION": "Manakov Dock",
+    "PSAMATHE-STATION": "Nelson Gateway",
+    "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",
+    "WOLF 1409-STATION": "Carter Vision",
+    "WOLF 1478-STATION": "Franklin Orbital",
+    "WOLF 294-STATION": "Hippalus Station",
+    "WOLF 359-STATION": "Lomas Orbiter",
+    "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",
+    "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",
+    "ZETA HERCULIS-STATION": "Shepherd Ring",
 }
 
 categories = {
diff --git a/misc/coord64.js b/misc/coord64.js
new file mode 100644
index 00000000..880f509e
--- /dev/null
+++ b/misc/coord64.js
@@ -0,0 +1,87 @@
+/*
+ * Coordinate ID generator:
+ * Takes a set of 3d coordinates (x, y, z), truncates to 2dp and then
+ * generates a base64-like(*) representation that can be used as an id
+ * for the object.
+ *
+ * The actual encoding is not base64, since base64 contains characters
+ * that present a problem when used, e.g, in URIs. I replaced the '+'
+ * and '/' characters with '_' and '.' respectively.
+ *
+ * Example usage:
+ *   coord_to_id64(51.5625, 32.1875, -27.125)
+ * Generates:
+ *   "1gA:Oi:-Go"
+ *
+ * A reversing function is also provided.
+ *
+ * Original Author: Oliver "kfsone" Smith <oliver@kfs.org>
+ * Released under the "use it with attribution" license.
+ */
+
+var alphabet = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_.";
+var precision = 100.;
+
+function coord_to_d64(coord) {
+    var i = parseInt(Math.abs(coord * precision));
+
+    var digits = ""
+	do {
+        digits = alphabet[i & 63] + digits;
+		i >>= 6;	// shift right by a digit (>>= 6)
+	} while (i > 0);
+
+	return (coord < 0) ? ("-"+digits) : (digits);
+}
+
+function d64_to_coord(d64) {
+	var divisor = precision;
+	var pos = 0;
+	if (d64[0] == '-') {
+		divisor = -divisor;
+		pos++;
+	}
+
+	var number = 0;
+	for ( ; pos < d64.length ; ++pos ) {
+        var value = alphabet.indexOf(d64[pos]);
+		if (value < 0)
+			throw "Invalid d64 value: " + d64;
+        number = (number * 64) + value;
+	}
+
+    return number / divisor;
+}
+
+function pos_to_id64(x, y, z) {
+    return coord_to_d64(x) + ':' + coord_to_d64(y) + ':' + coord_to_d64(z);
+}
+
+function id64_to_pos(id64) {
+	d64s = id64.split(':');
+	return [ d64_to_coord(d64s[0]),
+			 d64_to_coord(d64s[1]),
+			 d64_to_coord(d64s[2])
+			];
+}
+
+/*
+ * Test cases
+ *
+
+function test_conv(testPos) {
+    id64 = pos_to_id64(testPos[0], testPos[1], testPos[2]);
+	document.write("id64 [", testPos.join(','), "] = ", id64, "\n")
+	pos = id64_to_pos(id64);
+	document.write("pos of ", id64, " = [", pos.join(','), "]\n");
+}
+
+var test1 = [ 51.5625,32.1875,-27.125 ];
+var test2 = [ -154.65625,40.34375,-82.78125 ];
+
+test_conv(test1);
+test_conv(test1);
+test_conv(test2);
+
+*/
+
diff --git a/misc/coord64.py b/misc/coord64.py
new file mode 100644
index 00000000..80c10e71
--- /dev/null
+++ b/misc/coord64.py
@@ -0,0 +1,82 @@
+# Coordinate ID generator:
+# Takes a set of 3d coordinates (x, y, z), truncates to 2dp and then
+# generates a base64-like(*) representation that can be used as an id
+# for the object.
+#
+# The actual encoding is not base64, since base64 contains characters
+# that present a problem when used, e.g, in URIs. I replaced the '+'
+# and '/' characters with '_' and '.' respectively.
+#
+# Example usage:
+#   coord_to_id64(51.5625, 32.1875, -27.125)
+# Generates:
+#   "1gA:Oi:-Go"
+#
+# A reversing function is also provided.
+#
+# Original Author: Oliver "kfsone" Smith <oliver@kfs.org>
+# Released under the "use it with attribution" license.
+
+from __future__ import print_function, division
+import string
+
+alphabet = string.digits + string.ascii_lowercase + string.ascii_uppercase + '_.'
+precision = 100.
+
+def coord_to_d64(coord):
+    i = int(abs(coord * precision))
+
+    digits = ""
+    while True:
+        digits = alphabet[i & 63] + digits
+        i >>= 6   # divides by 64, or one digit
+        if i == 0:
+            break
+
+    sign = '-' if coord < 0 else ''
+    return sign + digits
+
+
+def d64_to_coord(d64):
+    divisor, digits = precision, d64
+    if d64.startswith('-'):
+        divisor = -divisor
+        digits = digits[1:]
+
+    number = 0
+    for digit in digits:
+        value = alphabet.find(digit)
+        if value < 0:
+            raise ValueError("Invalid d64 value: {}".format(value))
+        number = (number * 64) + value
+
+    return number / divisor
+
+
+def pos_to_id64(x, y, z):
+    return coord_to_d64(x) + ':' + coord_to_d64(y) + ':' + coord_to_d64(z)
+
+
+def id64_to_pos(id64):
+    (x64, y64, z64) = id64.split(':')
+    return (d64_to_coord(x64), d64_to_coord(y64), d64_to_coord(z64))
+
+
+if __name__ == "__main__":
+    test1 = ( 51.5625,32.1875,-27.125 )
+    test2 = ( -154.65625,40.34375,-82.78125 )
+
+    id64 = pos_to_id64(test1[0], test1[1], test1[2])
+    print("id64 of {} = {}".format(test1, id64))
+    pos = id64_to_pos(id64)
+    print("pos of {} = {}".format(id64, pos))
+
+    id64 = pos_to_id64(test1[0], test1[1], test1[2])
+    print("id64 of {} = {}".format(test1, id64))
+    pos = id64_to_pos(id64)
+    print("pos of {} = {}".format(id64, pos))
+
+    id64 = pos_to_id64(test2[0], test2[1], test2[2])
+    print("id64 of {} = {}".format(test2, id64))
+    pos = id64_to_pos(id64)
+    print("pos of {} = {}".format(id64, pos))