diff --git a/src/config_file.tcl b/src/config_file.tcl
index 5a90968..0baabbf 100755
--- a/src/config_file.tcl
+++ b/src/config_file.tcl
@@ -146,7 +146,7 @@ proc SaveConfigFile {configName} {
             puts $fileId "$key \"$value\""            
         }
     }
-    set config [dict set config values $values]
+    set $configName [dict set config values $values]
     close $fileId
 }
 
diff --git a/src/csgosl.tcl b/src/csgosl.tcl
index b341e02..e89d95b 100755
--- a/src/csgosl.tcl
+++ b/src/csgosl.tcl
@@ -4,6 +4,7 @@
 exec wish "$0" ${1+"$@"}
 
 #Later:
+#Shouldn't use custom map group name on command line (only for workshop mapgroup)
 #Run: vote on/off
 #Try newer img toolkit:
 #IMG_URL="https://sourceforge.net/settings/mirror_choices?projectname=tkimg&filename=tkimg/1.4/tkimg%201.4.5/tkimg-1.4.5.zip"
diff --git a/src/layout.tcl b/src/layout.tcl
index 8fed1b5..4868996 100755
--- a/src/layout.tcl
+++ b/src/layout.tcl
@@ -15,10 +15,12 @@ proc CreateLayout {pageOptions pageComponents} {
 proc CreatePageOptions {config} {
     set configName [dict get $config name]
     set prefix [dict get $config prefix]
+    #The prefix is hardcoded to Advanced-Tabs right now, these tabs are the only
+    #one using the default layout scheme
     return [list \
             configName "$configName" \
             tabName    "$prefix" \
-            help       "$prefix" \
+            help       "Advanced-Tabs" \
     ]
 }
 
diff --git a/src/server_support.tcl b/src/server_support.tcl
index 944a8ac..9336ded 100755
--- a/src/server_support.tcl
+++ b/src/server_support.tcl
@@ -111,7 +111,8 @@ proc StartServer {} {
     } else {
         chan configure stdout -buffering none
         chan configure stderr -buffering none
-        exec >@stdout 2>@stderr "$serverControlScript" $control "$serverFolder/$srcdsName" \
+        Trace "Executing $serverControlScript $control \
+            $serverFolder/$srcdsName \
              -game csgo $consoleCommand $rconCommand \
              +game_type $gameType +game_mode $gameMode \
              $mapGroupOption \
@@ -120,7 +121,19 @@ proc StartServer {} {
              -maxplayers_override $players \
              -tickrate $tickRate \
              $passwordOption \
-             +hostname "\"$serverName\"" $serverPort $serverLan \
+             +hostname \"$serverName\" $serverPort $serverLan \
+             $options"
+        exec >@stdout 2>@stderr "$serverControlScript" $control \
+            $serverFolder/$srcdsName \
+             -game csgo $consoleCommand $rconCommand \
+             +game_type $gameType +game_mode $gameMode \
+             $mapGroupOption \
+             $mapOption \
+             $steamAccount $apiAuthKey \
+             -maxplayers_override $players \
+             -tickrate $tickRate \
+             $passwordOption \
+             +hostname \"$serverName\" $serverPort $serverLan \
              $options
     }
 }
@@ -224,6 +237,7 @@ proc UpdateServer {} {
     if {$currentOs == "windows"} {
         RunAssync "\"$steamcmdFolder/$steamCmdExe\" +runscript \"$filename\""
     } else {
+        Trace "$steamcmdFolder/$steamCmdExe +runscript $filename"
         exec >@stdout 2>@stderr "$steamcmdFolder/$steamCmdExe" +runscript "$filename"
     }
 
diff --git a/src/widgets.tcl b/src/widgets.tcl
index 339850e..f00d0f4 100755
--- a/src/widgets.tcl
+++ b/src/widgets.tcl
@@ -8,7 +8,7 @@ source [file join $starkit::topdir browser.tcl]
 package require Tk
 
 proc Help {subject} {
-    Browser "http://www.google.se/webhp?sourceid=chrome-instant&ion=1&espv=2&ie=UTF-8#safe=off&q=$subject"
+    Browser "https://github.com/lenosisnickerboa/csgosl/wiki/Help-on-$subject"
 }
 
 proc GetDir {initialDir prompt} {