diff --git a/starmade.kvp b/starmade.kvp
index 5429ded..a53461e 100644
--- a/starmade.kvp
+++ b/starmade.kvp
@@ -1,7 +1,7 @@
 App.AdminMethod=STDIO
 App.ApplicationPort1=4242
 App.ApplicationReadyMode=RegexMatch
-App.BaseDirectory=./starmade/244770/StarMade
+App.BaseDirectory=./starmade/244770
 App.CommandLineArgs=-Xmx{{MaxHeap}}M -Xincgc -Xshare:off -jar StarMade.jar -server
 App.CommandLineParameterDelimiter= 
 App.CommandLineParameterFormat=-{0} "{1}"
@@ -10,7 +10,7 @@ App.EnvironmentVariables={"LD_LIBRARY_PATH": "./linux64:%LD_LIBRARY_PATH%", "Ste
 App.ExecutableLinux=244770/dep/java/jre1.7.0_80/bin/java
 App.ExecutableWin=244770\dep\java\jre1.7.0_80\bin\java.exe
 App.ExitMethod=OS_CLOSE
-App.ExitString=/shutdown
+App.ExitString=/shutdown 0
 App.HasReadableConsole=true
 App.HasWritableConsole=true
 App.RapidStartup=false
diff --git a/starmadeconfig.json b/starmadeconfig.json
index d8d5481..e612fa2 100644
--- a/starmadeconfig.json
+++ b/starmadeconfig.json
@@ -3,12 +3,12 @@
         "DisplayName": "Memory Limit (MB)",
         "Category": "Server Settings",
         "Description": "Java's maximum heap size",
-        "Keywords": "max ram",
+        "Keywords": "max ram heap",
         "FieldName": "MaxHeap",
         "InputType": "number",
         "IsFlagArgument": false,
         "ParamFieldName": "MaxHeap",
-        "IncludeInCommandLine": true,
+        "IncludeInCommandLine": false,
         "DefaultValue": "1024",
         "EnumValues": {}
     }