diff --git a/src/Augmentations.js b/src/Augmentations.js
index 23ccfb20d..68e6f6a68 100644
--- a/src/Augmentations.js
+++ b/src/Augmentations.js
@@ -1753,6 +1753,11 @@ applyAugmentation = function(aug, faction) {
 
     aug.owned = true;
     aug.factionInstalledBy = faction.name;
+    if (aug.name == AugmentationNames.NeuroFluxGovernor &&
+        Player.augmentations.indexOf(AugmentationNames.NeuroFluxGovernor) != -1) {
+        //Already have this aug, just upgrade the level
+        return;
+    }
     Player.augmentations.push(aug.name);
     ++Player.numAugmentations;
 }
diff --git a/src/SaveObject.js b/src/SaveObject.js
index 20a77549d..2a5f50580 100644
--- a/src/SaveObject.js
+++ b/src/SaveObject.js
@@ -43,7 +43,17 @@ loadGame = function(saveObj) {
     Factions        = JSON.parse(saveObj.FactionsSave, Reviver);
     SpecialServerIps = JSON.parse(saveObj.SpecialServerIpsSave, Reviver);
     Augmentations   = JSON.parse(saveObj.AugmentationsSave, Reviver);
-    Aliases         = JSON.parse(saveObj.AliasesSave, Reviver);
+    if (saveObj.hasOwnProperty(AliasesSave)) {
+        try {
+            Aliases         = JSON.parse(saveObj.AliasesSave, Reviver);
+        } catch(e) {
+            Aliases = {};
+        }
+    } else {
+        Aliases = {};
+    }
+    
+    
     return true;
 }
 
diff --git a/src/Terminal.js b/src/Terminal.js
index c7bd2f9b1..16a777c66 100644
--- a/src/Terminal.js
+++ b/src/Terminal.js
@@ -732,6 +732,13 @@ var Terminal = {
 					}
 				}
 				break;
+            case "scan-analyze":
+                if (commandArray.length != 1) {
+                    post("Incorrect number of arguments. Usage: scan-analyze");
+                } else {
+                    Terminal.executeScanAnalyzeCommand();
+                }
+                break;
 			case "scp":
 				//TODO
 				break;
diff --git a/utils/PurchaseAugmentationBox.js b/utils/PurchaseAugmentationBox.js
index 0d30e04d2..d27e8196c 100644
--- a/utils/PurchaseAugmentationBox.js
+++ b/utils/PurchaseAugmentationBox.js
@@ -154,7 +154,6 @@ purchaseAugmentationBoxCreate = function(aug, fac) {
             }
         } else if (Player.money >= (aug.baseCost * fac.augmentationPriceMult)) {
             applyAugmentation(aug, fac);
-            //TODO Make this text better
             dialogBoxCreate("You slowly drift to sleep as " + fac.name + "'s scientists put you under " +
                             " in order to install the " + aug.name + " Augmentation. <br><br>" +
                             "You wake up in your home...you feel different...");