diff --git a/css/terminal.css b/css/terminal.css
index ca64638e8..c22100b9c 100644
--- a/css/terminal.css
+++ b/css/terminal.css
@@ -4,7 +4,7 @@
 	height: 100%;
     width: 99%;
 	overflow: auto;
-	overflow-y: scroll;    
+	overflow-y: scroll;
 }
 
 #terminal {
@@ -19,11 +19,6 @@
     table-layout:fixed;
 }
 
-/*
-.posted {
-    width: 70%;
-}*/
-
 #terminal-input {
     background-color: var(--my-background-color);
     color: var(--my-font-color);
@@ -31,8 +26,7 @@
 }
 
 .terminal-input {
-	display: table-cell;
-    width: 90%;
+	display: inline-block;
 	padding: 0px !important;
 	margin: 0px !important;
 	border: 0px;
diff --git a/dist/bundle.js b/dist/bundle.js
index fe86fb2a3..b97061b84 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -113,19 +113,21 @@
 
 function PlayerObject() {
     //Skills and stats
-    this.hacking_skill   = 1;
+    this.hacking_skill  = 1;
 
-    //Fighting
-    this.hp              = 10;
-    this.max_hp          = 10;
-    this.strength        = 1;      //Damage dealt
-    this.defense         = 1;      //Damage received
-    this.dexterity       = 1;      //Accuracy
-    this.agility         = 1;      //Dodge %
+    //Combat stats
+    this.hp             = 10;
+    this.max_hp         = 10;
+    this.strength       = 1;      //Damage dealt
+    this.defense        = 1;      //Damage received
+    this.dexterity      = 1;      //Accuracy
+    this.agility        = 1;      //Dodge %
 
     //Labor stats
-    this.charisma        = 1;
-	//Intelligence, perhaps?
+    this.charisma       = 1;
+
+    //Special stats
+    this.intelligence   = 0;
 
     //Hacking multipliers
     this.hacking_chance_mult    = 1;  //Increase through ascensions/augmentations
@@ -140,6 +142,7 @@ function PlayerObject() {
     this.dexterity_exp   = 0;
     this.agility_exp     = 0;
     this.charisma_exp    = 0;
+    this.intelligence_exp= 0;
 
     this.hacking_mult       = 1;
     this.strength_mult      = 1;
@@ -658,6 +661,13 @@ PlayerObject.prototype.gainCharismaExp = function(exp) {
     this.charisma_exp += exp;
 }
 
+PlayerObject.prototype.gainIntelligenceExp = function(exp) {
+    if (isNaN(exp)) {
+        console.log("ERROR: NaN passed into Player.gainIntelligenceExp()"); return;
+    }
+    //TODO
+}
+
 /******* Working functions *******/
 PlayerObject.prototype.resetWorkStatus = function() {
     this.workHackExpGainRate    = 0;
@@ -2455,7 +2465,7 @@ function dialogBoxCreate(txt) {
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return CONSTANTS; });
 let CONSTANTS = {
-    Version:                "0.28.4",
+    Version:                "0.28.5",
 
 	//Max level for any skill, assuming no multipliers. Determined by max numerical value in javascript for experience
     //and the skill level formula in Player.js. Note that all this means it that when experience hits MAX_INT, then
@@ -3331,6 +3341,12 @@ let CONSTANTS = {
                                "World Stock Exchange account and TIX API Access<br>",
 
     LatestUpdate:
+    "v0.28.5<br>" +
+    "-The fl1ght.exe program that is received from jump3r is now sent very early on in the game, rather " +
+    "than at hacking level 1000<br>" +
+    "-Hostname is now displayed in Terminal<br>" +
+    "-Syntax highlighting now works for all Netscript functions<br>" +
+    "-Export should now work on Edge/IE<br><br>" +
     "v0.28.4<br>" +
     "-Added getScriptIncome() Netscript function<br>" +
     "-Added Javascript's Math module to Netscript. See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math<br>" +
@@ -4548,13 +4564,7 @@ let Engine = {
             if (__WEBPACK_IMPORTED_MODULE_21__Player_js__["a" /* Player */].firstProgramAvailable) {visibleMenuTabs.push(createProgram);}
             else {createProgram.style.display = "none";}
 
-            Engine.closeMainMenuHeader(visibleMenuTabs
-                /*
-                [terminal, createScript, activeScripts, createProgram, stats,
-                 factions, augmentations, hacknetnodes, city, travel, job,
-                 tutorial, options]
-                 */
-            );
+            Engine.closeMainMenuHeader(visibleMenuTabs);
         } else {
             //No save found, start new game
             console.log("Initializing new game");
@@ -4594,11 +4604,6 @@ let Engine = {
             createProgram.style.display = "none";
 
             Engine.openMainMenuHeader(
-                /*
-                [terminal, createScript, activeScripts, createProgram, stats,
-                 factions, augmentations, hacknetnodes, city, travel, job,
-                 tutorial, options]
-                */
                 [terminal, createScript, activeScripts, stats,
                  hacknetnodes, city,
                  tutorial, options]
@@ -4610,6 +4615,7 @@ let Engine = {
         }
         //Initialize labels on game settings
         Object(__WEBPACK_IMPORTED_MODULE_27__Settings_js__["d" /* setSettingsLabels */])();
+        __WEBPACK_IMPORTED_MODULE_31__Terminal_js__["a" /* Terminal */].resetTerminalInput();
     },
 
     setDisplayElements: function() {
@@ -20026,7 +20032,7 @@ function runScriptsLoop() {
 		if (workerScripts[i].running == false && workerScripts[i].env.stopFlag == false) {
 			try {
 				var ast = Object(__WEBPACK_IMPORTED_MODULE_7__utils_acorn_js__["parse"])(workerScripts[i].code);
-                console.log(ast);
+                //console.log(ast);
 			} catch (e) {
                 console.log("Error parsing script: " + workerScripts[i].name);
                 Object(__WEBPACK_IMPORTED_MODULE_8__utils_DialogBox_js__["a" /* dialogBoxCreate */])("Syntax ERROR in " + workerScripts[i].name + ":<br>" +  e);
@@ -24046,10 +24052,10 @@ $(document).keydown(function(event) {
             event.preventDefault(); //Prevent newline from being entered in Script Editor
 			var command = $('input[class=terminal-input]').val();
 			if (command.length > 0) {
-				post("> " + command);
+                post("[" + __WEBPACK_IMPORTED_MODULE_10__Player_js__["a" /* Player */].getCurrentServer().hostname + " ~]> " + command);
 
+                Terminal.resetTerminalInput();      //Clear input first
 				Terminal.executeCommand(command);
-				$('input[class=terminal-input]').val("");
 			}
 		}
 
@@ -24380,6 +24386,17 @@ let Terminal = {
         }
     },
 
+    resetTerminalInput: function() {
+        document.getElementById("terminal-input-td").innerHTML =
+            "<div id='terminal-input-header'>[" + __WEBPACK_IMPORTED_MODULE_10__Player_js__["a" /* Player */].getCurrentServer().hostname + " ~]" + "$ </div>" +
+            '<input type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1"/>';
+        var hdr = document.getElementById("terminal-input-header");
+        hdr.style.display = "inline";
+        var lineWidth = document.getElementById("terminal-input-td").offsetWidth;
+        var width = lineWidth - hdr.offsetWidth - 10;
+        document.getElementById("terminal-input-text-box").style.width = width + "px";
+    },
+
     //Complete the hack/analyze command
 	finishHack: function(cancelled = false) {
 		if (cancelled == false) {
@@ -24425,7 +24442,8 @@ let Terminal = {
         //Rename the progress bar so that the next hacks dont trigger it. Re-enable terminal
         $("#hack-progress-bar").attr('id', "old-hack-progress-bar");
         $("#hack-progress").attr('id', "old-hack-progress");
-        document.getElementById("terminal-input-td").innerHTML = '$ <input type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1"/>';
+        Terminal.resetTerminalInput();
+        //document.getElementById("terminal-input-td").innerHTML = '$ <input type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1"/>';
         $('input[class=terminal-input]').prop('disabled', false);
 
         Terminal.hackFlag = false;
@@ -24480,7 +24498,8 @@ let Terminal = {
         //Rename the progress bar so that the next hacks dont trigger it. Re-enable terminal
         $("#hack-progress-bar").attr('id', "old-hack-progress-bar");
         $("#hack-progress").attr('id', "old-hack-progress");
-        document.getElementById("terminal-input-td").innerHTML = '$ <input type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1"/>';
+        Terminal.resetTerminalInput();
+        //document.getElementById("terminal-input-td").innerHTML = '$ <input type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1"/>';
         $('input[class=terminal-input]').prop('disabled', false);
     },
 
@@ -24577,6 +24596,7 @@ let Terminal = {
                     __WEBPACK_IMPORTED_MODULE_10__Player_js__["a" /* Player */].analyze();
 
                     //Disable terminal
+                    //Terminal.resetTerminalInput();
                     document.getElementById("terminal-input-td").innerHTML = '<input type="text" class="terminal-input"/>';
                     $('input[class=terminal-input]').prop('disabled', true);
                     Object(__WEBPACK_IMPORTED_MODULE_6__InteractiveTutorial_js__["c" /* iTutorialNextStep */])();
@@ -24600,6 +24620,7 @@ let Terminal = {
 					__WEBPACK_IMPORTED_MODULE_10__Player_js__["a" /* Player */].hack();
 
 					//Disable terminal
+                    //Terminal.resetTerminalInput();
 					document.getElementById("terminal-input-td").innerHTML = '<input type="text" class="terminal-input"/>';
 					$('input[class=terminal-input]').prop('disabled', true);
                     Object(__WEBPACK_IMPORTED_MODULE_6__InteractiveTutorial_js__["c" /* iTutorialNextStep */])();
@@ -24680,6 +24701,7 @@ let Terminal = {
                 __WEBPACK_IMPORTED_MODULE_10__Player_js__["a" /* Player */].analyze();
 
                 //Disable terminal
+                //Terminal.resetTerminalInput();
                 document.getElementById("terminal-input-td").innerHTML = '<input type="text" class="terminal-input"/>';
                 $('input[class=terminal-input]').prop('disabled', true);
 				break;
@@ -24783,6 +24805,7 @@ let Terminal = {
 					__WEBPACK_IMPORTED_MODULE_10__Player_js__["a" /* Player */].hack();
 
 					//Disable terminal
+                    //Terminal.resetTerminalInput();
 					document.getElementById("terminal-input-td").innerHTML = '<input type="text" class="terminal-input"/>';
 					$('input[class=terminal-input]').prop('disabled', true);
 				}
@@ -24811,6 +24834,7 @@ let Terminal = {
                 __WEBPACK_IMPORTED_MODULE_10__Player_js__["a" /* Player */].currentServer = __WEBPACK_IMPORTED_MODULE_10__Player_js__["a" /* Player */].getHomeComputer().ip;
                 __WEBPACK_IMPORTED_MODULE_10__Player_js__["a" /* Player */].getCurrentServer().isConnectedTo = true;
                 post("Connected to home");
+                Terminal.resetTerminalInput();
 				break;
 			case "hostname":
 				if (commandArray.length != 1) {
@@ -25225,6 +25249,7 @@ let Terminal = {
         if (__WEBPACK_IMPORTED_MODULE_10__Player_js__["a" /* Player */].getCurrentServer().hostname == "darkweb") {
             Object(__WEBPACK_IMPORTED_MODULE_3__DarkWeb_js__["b" /* checkIfConnectedToDarkweb */])(); //Posts a 'help' message if connecting to dark web
         }
+        Terminal.resetTerminalInput();
     },
 
     executeListCommand: function(commandArray) {
@@ -25800,7 +25825,6 @@ function checkForMessagesToSend() {
     var jumper2 = Messages[MessageFilenames.Jumper2];
     var jumper3 = Messages[MessageFilenames.Jumper3];
     var jumper4 = Messages[MessageFilenames.Jumper4];
-    var jumper5 = Messages[MessageFilenames.Jumper5];
     var cybersecTest    = Messages[MessageFilenames.CyberSecTest];
     var nitesecTest     = Messages[MessageFilenames.NiteSecTest];
     var bitrunnersTest  = Messages[MessageFilenames.BitRunnersTest];
@@ -25813,6 +25837,7 @@ function checkForMessagesToSend() {
 
     if (jumper0 && !jumper0.recvd && __WEBPACK_IMPORTED_MODULE_2__Player_js__["a" /* Player */].hacking_skill >= 25) {
         sendMessage(jumper0);
+        __WEBPACK_IMPORTED_MODULE_2__Player_js__["a" /* Player */].getHomeComputer().programs.push(__WEBPACK_IMPORTED_MODULE_1__CreateProgram_js__["a" /* Programs */].Flight);
     } else if (jumper1 && !jumper1.recvd && __WEBPACK_IMPORTED_MODULE_2__Player_js__["a" /* Player */].hacking_skill >= 40) {
         sendMessage(jumper1);
     } else if (cybersecTest && !cybersecTest.recvd && __WEBPACK_IMPORTED_MODULE_2__Player_js__["a" /* Player */].hacking_skill >= 50) {
@@ -25827,9 +25852,6 @@ function checkForMessagesToSend() {
         sendMessage(jumper4);
     } else if (bitrunnersTest && !bitrunnersTest.recvd && __WEBPACK_IMPORTED_MODULE_2__Player_js__["a" /* Player */].hacking_skill >= 500) {
         sendMessage(bitrunnersTest);
-    } else if (jumper5 && !jumper5.recvd && __WEBPACK_IMPORTED_MODULE_2__Player_js__["a" /* Player */].hacking_skill >= 1000) {
-        sendMessage(jumper5);
-        __WEBPACK_IMPORTED_MODULE_2__Player_js__["a" /* Player */].getHomeComputer().programs.push(__WEBPACK_IMPORTED_MODULE_1__CreateProgram_js__["a" /* Programs */].Flight);
     } else if (redpill && !redpill.recvd && __WEBPACK_IMPORTED_MODULE_2__Player_js__["a" /* Player */].hacking_skill >= 2000 && redpillOwned) {
         sendMessage(redpill);
     }
@@ -25851,7 +25873,6 @@ let MessageFilenames = {
     Jumper2:    "j2.msg",
     Jumper3:    "j3.msg",
     Jumper4:    "j4.msg",
-    Jumper5:    "j5.msg",
     CyberSecTest:   "csec-test.msg",
     NiteSecTest:    "nitesec-test.msg",
     BitRunnersTest: "19dfj3l1nd.msg",
@@ -25867,7 +25888,10 @@ function initMessages()  {
                                  "I know you can sense it. I know you're searching for it. " +
                                  "It's why you spend night after " +
                                  "night at your computer. <br><br>It's real, I've seen it. And I can " +
-                                 "help you find it. But not right now. You're not ready yet.<br><br>-jump3R"));
+                                 "help you find it. But not right now. You're not ready yet.<br><br>" +
+                                 "Use this program to track your progress<br><br>" +
+                                 "The fl1ght.exe program was added to your home computer<br><br>" +
+                                 "-jump3R"));
     AddToAllMessages(new Message(MessageFilenames.Jumper1,
                                  "Soon you will be contacted by a hacking group known as CyberSec. " +
                                  "They can help you with your search. <br><br>" +
@@ -25888,9 +25912,6 @@ function initMessages()  {
                                  "To find what you are searching for, you must understand the bits. " +
                                  "The bits are all around us. The runners will help you.<br><br>" +
                                  "-jump3R"));
-    AddToAllMessages(new Message(MessageFilenames.Jumper5,
-                                 "Build your wings and fly<br><br>-jump3R<br><br> " +
-                                 "The fl1ght.exe program was added to your home computer"));
 
     //Messages from hacking factions
     AddToAllMessages(new Message(MessageFilenames.CyberSecTest,
@@ -34085,6 +34106,7 @@ function prestigeAugmentation() {
 
     var mainMenu = document.getElementById("mainmenu-container");
     mainMenu.style.visibility = "visible";
+    __WEBPACK_IMPORTED_MODULE_14__Terminal_js__["a" /* Terminal */].resetTerminalInput();
     __WEBPACK_IMPORTED_MODULE_5__engine_js__["Engine"].loadTerminalContent();
 
     //Red Pill
@@ -34183,6 +34205,7 @@ function prestigeSourceFile() {
 
     var mainMenu = document.getElementById("mainmenu-container");
     mainMenu.style.visibility = "visible";
+    __WEBPACK_IMPORTED_MODULE_14__Terminal_js__["a" /* Terminal */].resetTerminalInput();
     __WEBPACK_IMPORTED_MODULE_5__engine_js__["Engine"].loadTerminalContent();
 }
 
@@ -38570,6 +38593,7 @@ function runScriptFromScript(server, scriptname, args, workerScript, threads=1)
             //Check for admin rights and that there is enough RAM availble to run
             var script = server.scripts[i];
             var ramUsage = script.ramUsage;
+            threads = Math.round(Number(threads)); //Convert to number and round
             ramUsage = ramUsage * threads * Math.pow(__WEBPACK_IMPORTED_MODULE_1__Constants_js__["a" /* CONSTANTS */].MultithreadingRAMCost, threads-1);
             var ramAvailable = server.maxRam - server.ramUsed;
 
@@ -59831,7 +59855,9 @@ var NetscriptHighlightRules = function(options) {
             "getUpgradeHomeRamCost|workForCompany|applyToCompany|getCompanyRep|"       +
             "checkFactionInvitations|joinFaction|workForFaction|getFactionRep|"        +
             "createProgram|getAugmentationCost|purchaseAugmentation|"                  +
-            "installAugmentations|"                                                    +
+            "installAugmentations|hacknetnodes|upgradeLevel|upgradeRam|upgradeCore|"   +
+            "getLevelUpgradeCost|getRamUpgradeCost|getCoreUpgradeCost|"                +
+            "getStockPrice|getStockPosition|buyStock|sellStock|"                       +
             "JSON|Math|"                                                               + // Other
             "this|arguments|prototype|window|document"                                 , // Pseudo
         "keyword":
@@ -72678,7 +72704,7 @@ BitburnerSaveObject.prototype.exportGame = function() {
     this.VersionSave                = JSON.stringify(__WEBPACK_IMPORTED_MODULE_2__Constants_js__["a" /* CONSTANTS */].Version);
 
     var saveString = btoa(unescape(encodeURIComponent(JSON.stringify(this))));
-
+    var filename = "bitburnerSave.json";
     var file = new Blob([saveString], {type: 'text/plain'});
     if (window.navigator.msSaveOrOpenBlob) {// IE10+
         window.navigator.msSaveOrOpenBlob(file, filename);
diff --git a/src/Constants.js b/src/Constants.js
index 3352ef8b8..d12e6969e 100644
--- a/src/Constants.js
+++ b/src/Constants.js
@@ -1,5 +1,5 @@
 let CONSTANTS = {
-    Version:                "0.28.4",
+    Version:                "0.28.5",
 
 	//Max level for any skill, assuming no multipliers. Determined by max numerical value in javascript for experience
     //and the skill level formula in Player.js. Note that all this means it that when experience hits MAX_INT, then
@@ -875,6 +875,12 @@ let CONSTANTS = {
                                "World Stock Exchange account and TIX API Access<br>",
 
     LatestUpdate:
+    "v0.28.5<br>" +
+    "-The fl1ght.exe program that is received from jump3r is now sent very early on in the game, rather " +
+    "than at hacking level 1000<br>" +
+    "-Hostname is now displayed in Terminal<br>" +
+    "-Syntax highlighting now works for all Netscript functions<br>" +
+    "-Export should now work on Edge/IE<br><br>" +
     "v0.28.4<br>" +
     "-Added getScriptIncome() Netscript function<br>" +
     "-Added Javascript's Math module to Netscript. See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math<br>" +
diff --git a/src/Message.js b/src/Message.js
index 6404e6e3a..7b87ae3e7 100644
--- a/src/Message.js
+++ b/src/Message.js
@@ -60,7 +60,6 @@ function checkForMessagesToSend() {
     var jumper2 = Messages[MessageFilenames.Jumper2];
     var jumper3 = Messages[MessageFilenames.Jumper3];
     var jumper4 = Messages[MessageFilenames.Jumper4];
-    var jumper5 = Messages[MessageFilenames.Jumper5];
     var cybersecTest    = Messages[MessageFilenames.CyberSecTest];
     var nitesecTest     = Messages[MessageFilenames.NiteSecTest];
     var bitrunnersTest  = Messages[MessageFilenames.BitRunnersTest];
@@ -73,6 +72,7 @@ function checkForMessagesToSend() {
 
     if (jumper0 && !jumper0.recvd && Player.hacking_skill >= 25) {
         sendMessage(jumper0);
+        Player.getHomeComputer().programs.push(Programs.Flight);
     } else if (jumper1 && !jumper1.recvd && Player.hacking_skill >= 40) {
         sendMessage(jumper1);
     } else if (cybersecTest && !cybersecTest.recvd && Player.hacking_skill >= 50) {
@@ -87,9 +87,6 @@ function checkForMessagesToSend() {
         sendMessage(jumper4);
     } else if (bitrunnersTest && !bitrunnersTest.recvd && Player.hacking_skill >= 500) {
         sendMessage(bitrunnersTest);
-    } else if (jumper5 && !jumper5.recvd && Player.hacking_skill >= 1000) {
-        sendMessage(jumper5);
-        Player.getHomeComputer().programs.push(Programs.Flight);
     } else if (redpill && !redpill.recvd && Player.hacking_skill >= 2000 && redpillOwned) {
         sendMessage(redpill);
     }
@@ -111,7 +108,6 @@ let MessageFilenames = {
     Jumper2:    "j2.msg",
     Jumper3:    "j3.msg",
     Jumper4:    "j4.msg",
-    Jumper5:    "j5.msg",
     CyberSecTest:   "csec-test.msg",
     NiteSecTest:    "nitesec-test.msg",
     BitRunnersTest: "19dfj3l1nd.msg",
@@ -127,7 +123,10 @@ function initMessages()  {
                                  "I know you can sense it. I know you're searching for it. " +
                                  "It's why you spend night after " +
                                  "night at your computer. <br><br>It's real, I've seen it. And I can " +
-                                 "help you find it. But not right now. You're not ready yet.<br><br>-jump3R"));
+                                 "help you find it. But not right now. You're not ready yet.<br><br>" +
+                                 "Use this program to track your progress<br><br>" +
+                                 "The fl1ght.exe program was added to your home computer<br><br>" +
+                                 "-jump3R"));
     AddToAllMessages(new Message(MessageFilenames.Jumper1,
                                  "Soon you will be contacted by a hacking group known as CyberSec. " +
                                  "They can help you with your search. <br><br>" +
@@ -148,9 +147,6 @@ function initMessages()  {
                                  "To find what you are searching for, you must understand the bits. " +
                                  "The bits are all around us. The runners will help you.<br><br>" +
                                  "-jump3R"));
-    AddToAllMessages(new Message(MessageFilenames.Jumper5,
-                                 "Build your wings and fly<br><br>-jump3R<br><br> " +
-                                 "The fl1ght.exe program was added to your home computer"));
 
     //Messages from hacking factions
     AddToAllMessages(new Message(MessageFilenames.CyberSecTest,
diff --git a/src/NetscriptEvaluator.js b/src/NetscriptEvaluator.js
index c1bd5af46..2fcffdca1 100644
--- a/src/NetscriptEvaluator.js
+++ b/src/NetscriptEvaluator.js
@@ -621,6 +621,7 @@ function runScriptFromScript(server, scriptname, args, workerScript, threads=1)
             //Check for admin rights and that there is enough RAM availble to run
             var script = server.scripts[i];
             var ramUsage = script.ramUsage;
+            threads = Math.round(Number(threads)); //Convert to number and round
             ramUsage = ramUsage * threads * Math.pow(CONSTANTS.MultithreadingRAMCost, threads-1);
             var ramAvailable = server.maxRam - server.ramUsed;
 
diff --git a/src/NetscriptWorker.js b/src/NetscriptWorker.js
index c6c1deee5..0b7d36618 100644
--- a/src/NetscriptWorker.js
+++ b/src/NetscriptWorker.js
@@ -92,7 +92,7 @@ function runScriptsLoop() {
 		if (workerScripts[i].running == false && workerScripts[i].env.stopFlag == false) {
 			try {
 				var ast = parse(workerScripts[i].code);
-                console.log(ast);
+                //console.log(ast);
 			} catch (e) {
                 console.log("Error parsing script: " + workerScripts[i].name);
                 dialogBoxCreate("Syntax ERROR in " + workerScripts[i].name + ":<br>" +  e);
diff --git a/src/Player.js b/src/Player.js
index 4dbcca717..0137dd5bb 100644
--- a/src/Player.js
+++ b/src/Player.js
@@ -26,19 +26,21 @@ import {formatNumber,
 
 function PlayerObject() {
     //Skills and stats
-    this.hacking_skill   = 1;
+    this.hacking_skill  = 1;
 
-    //Fighting
-    this.hp              = 10;
-    this.max_hp          = 10;
-    this.strength        = 1;      //Damage dealt
-    this.defense         = 1;      //Damage received
-    this.dexterity       = 1;      //Accuracy
-    this.agility         = 1;      //Dodge %
+    //Combat stats
+    this.hp             = 10;
+    this.max_hp         = 10;
+    this.strength       = 1;      //Damage dealt
+    this.defense        = 1;      //Damage received
+    this.dexterity      = 1;      //Accuracy
+    this.agility        = 1;      //Dodge %
 
     //Labor stats
-    this.charisma        = 1;
-	//Intelligence, perhaps?
+    this.charisma       = 1;
+
+    //Special stats
+    this.intelligence   = 0;
 
     //Hacking multipliers
     this.hacking_chance_mult    = 1;  //Increase through ascensions/augmentations
@@ -53,6 +55,7 @@ function PlayerObject() {
     this.dexterity_exp   = 0;
     this.agility_exp     = 0;
     this.charisma_exp    = 0;
+    this.intelligence_exp= 0;
 
     this.hacking_mult       = 1;
     this.strength_mult      = 1;
@@ -571,6 +574,13 @@ PlayerObject.prototype.gainCharismaExp = function(exp) {
     this.charisma_exp += exp;
 }
 
+PlayerObject.prototype.gainIntelligenceExp = function(exp) {
+    if (isNaN(exp)) {
+        console.log("ERROR: NaN passed into Player.gainIntelligenceExp()"); return;
+    }
+    //TODO
+}
+
 /******* Working functions *******/
 PlayerObject.prototype.resetWorkStatus = function() {
     this.workHackExpGainRate    = 0;
diff --git a/src/Prestige.js b/src/Prestige.js
index a625ec434..97d9a2923 100644
--- a/src/Prestige.js
+++ b/src/Prestige.js
@@ -117,6 +117,7 @@ function prestigeAugmentation() {
 
     var mainMenu = document.getElementById("mainmenu-container");
     mainMenu.style.visibility = "visible";
+    Terminal.resetTerminalInput();
     Engine.loadTerminalContent();
 
     //Red Pill
@@ -215,6 +216,7 @@ function prestigeSourceFile() {
 
     var mainMenu = document.getElementById("mainmenu-container");
     mainMenu.style.visibility = "visible";
+    Terminal.resetTerminalInput();
     Engine.loadTerminalContent();
 }
 
diff --git a/src/SaveObject.js b/src/SaveObject.js
index e402d44e1..81a85aaa4 100644
--- a/src/SaveObject.js
+++ b/src/SaveObject.js
@@ -466,7 +466,7 @@ BitburnerSaveObject.prototype.exportGame = function() {
     this.VersionSave                = JSON.stringify(CONSTANTS.Version);
 
     var saveString = btoa(unescape(encodeURIComponent(JSON.stringify(this))));
-
+    var filename = "bitburnerSave.json";
     var file = new Blob([saveString], {type: 'text/plain'});
     if (window.navigator.msSaveOrOpenBlob) {// IE10+
         window.navigator.msSaveOrOpenBlob(file, filename);
diff --git a/src/Terminal.js b/src/Terminal.js
index 3902dafb0..598cb1dba 100644
--- a/src/Terminal.js
+++ b/src/Terminal.js
@@ -72,10 +72,10 @@ $(document).keydown(function(event) {
             event.preventDefault(); //Prevent newline from being entered in Script Editor
 			var command = $('input[class=terminal-input]').val();
 			if (command.length > 0) {
-				post("> " + command);
+                post("[" + Player.getCurrentServer().hostname + " ~]> " + command);
 
+                Terminal.resetTerminalInput();      //Clear input first
 				Terminal.executeCommand(command);
-				$('input[class=terminal-input]').val("");
 			}
 		}
 
@@ -406,6 +406,17 @@ let Terminal = {
         }
     },
 
+    resetTerminalInput: function() {
+        document.getElementById("terminal-input-td").innerHTML =
+            "<div id='terminal-input-header'>[" + Player.getCurrentServer().hostname + " ~]" + "$ </div>" +
+            '<input type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1"/>';
+        var hdr = document.getElementById("terminal-input-header");
+        hdr.style.display = "inline";
+        var lineWidth = document.getElementById("terminal-input-td").offsetWidth;
+        var width = lineWidth - hdr.offsetWidth - 10;
+        document.getElementById("terminal-input-text-box").style.width = width + "px";
+    },
+
     //Complete the hack/analyze command
 	finishHack: function(cancelled = false) {
 		if (cancelled == false) {
@@ -451,7 +462,8 @@ let Terminal = {
         //Rename the progress bar so that the next hacks dont trigger it. Re-enable terminal
         $("#hack-progress-bar").attr('id', "old-hack-progress-bar");
         $("#hack-progress").attr('id', "old-hack-progress");
-        document.getElementById("terminal-input-td").innerHTML = '$ <input type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1"/>';
+        Terminal.resetTerminalInput();
+        //document.getElementById("terminal-input-td").innerHTML = '$ <input type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1"/>';
         $('input[class=terminal-input]').prop('disabled', false);
 
         Terminal.hackFlag = false;
@@ -506,7 +518,8 @@ let Terminal = {
         //Rename the progress bar so that the next hacks dont trigger it. Re-enable terminal
         $("#hack-progress-bar").attr('id', "old-hack-progress-bar");
         $("#hack-progress").attr('id', "old-hack-progress");
-        document.getElementById("terminal-input-td").innerHTML = '$ <input type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1"/>';
+        Terminal.resetTerminalInput();
+        //document.getElementById("terminal-input-td").innerHTML = '$ <input type="text" id="terminal-input-text-box" class="terminal-input" tabindex="1"/>';
         $('input[class=terminal-input]').prop('disabled', false);
     },
 
@@ -603,6 +616,7 @@ let Terminal = {
                     Player.analyze();
 
                     //Disable terminal
+                    //Terminal.resetTerminalInput();
                     document.getElementById("terminal-input-td").innerHTML = '<input type="text" class="terminal-input"/>';
                     $('input[class=terminal-input]').prop('disabled', true);
                     iTutorialNextStep();
@@ -626,6 +640,7 @@ let Terminal = {
 					Player.hack();
 
 					//Disable terminal
+                    //Terminal.resetTerminalInput();
 					document.getElementById("terminal-input-td").innerHTML = '<input type="text" class="terminal-input"/>';
 					$('input[class=terminal-input]').prop('disabled', true);
                     iTutorialNextStep();
@@ -706,6 +721,7 @@ let Terminal = {
                 Player.analyze();
 
                 //Disable terminal
+                //Terminal.resetTerminalInput();
                 document.getElementById("terminal-input-td").innerHTML = '<input type="text" class="terminal-input"/>';
                 $('input[class=terminal-input]').prop('disabled', true);
 				break;
@@ -809,6 +825,7 @@ let Terminal = {
 					Player.hack();
 
 					//Disable terminal
+                    //Terminal.resetTerminalInput();
 					document.getElementById("terminal-input-td").innerHTML = '<input type="text" class="terminal-input"/>';
 					$('input[class=terminal-input]').prop('disabled', true);
 				}
@@ -837,6 +854,7 @@ let Terminal = {
                 Player.currentServer = Player.getHomeComputer().ip;
                 Player.getCurrentServer().isConnectedTo = true;
                 post("Connected to home");
+                Terminal.resetTerminalInput();
 				break;
 			case "hostname":
 				if (commandArray.length != 1) {
@@ -1251,6 +1269,7 @@ let Terminal = {
         if (Player.getCurrentServer().hostname == "darkweb") {
             checkIfConnectedToDarkweb(); //Posts a 'help' message if connecting to dark web
         }
+        Terminal.resetTerminalInput();
     },
 
     executeListCommand: function(commandArray) {
diff --git a/src/engine.js b/src/engine.js
index 5129e72f4..dd2cf16e1 100644
--- a/src/engine.js
+++ b/src/engine.js
@@ -1161,13 +1161,7 @@ let Engine = {
             if (Player.firstProgramAvailable) {visibleMenuTabs.push(createProgram);}
             else {createProgram.style.display = "none";}
 
-            Engine.closeMainMenuHeader(visibleMenuTabs
-                /*
-                [terminal, createScript, activeScripts, createProgram, stats,
-                 factions, augmentations, hacknetnodes, city, travel, job,
-                 tutorial, options]
-                 */
-            );
+            Engine.closeMainMenuHeader(visibleMenuTabs);
         } else {
             //No save found, start new game
             console.log("Initializing new game");
@@ -1207,11 +1201,6 @@ let Engine = {
             createProgram.style.display = "none";
 
             Engine.openMainMenuHeader(
-                /*
-                [terminal, createScript, activeScripts, createProgram, stats,
-                 factions, augmentations, hacknetnodes, city, travel, job,
-                 tutorial, options]
-                */
                 [terminal, createScript, activeScripts, stats,
                  hacknetnodes, city,
                  tutorial, options]
@@ -1223,6 +1212,7 @@ let Engine = {
         }
         //Initialize labels on game settings
         setSettingsLabels();
+        Terminal.resetTerminalInput();
     },
 
     setDisplayElements: function() {