diff --git a/MinecraftClient/Bots.cs b/MinecraftClient/Bots.cs
index afb7af46..8260fcb6 100644
--- a/MinecraftClient/Bots.cs
+++ b/MinecraftClient/Bots.cs
@@ -610,7 +610,7 @@ namespace MinecraftClient
 
                         if (ok)
                         {
-                            Console.Beep(); //Text found !
+                            if (Settings.Alerts_Beep_Enabled) { Console.Beep(); } //Text found !
 
                             if (ConsoleIO.basicIO) { ConsoleIO.WriteLine(comp.Replace(alert, "§c" + alert + "§r")); } else {
 
diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs
index 0a0f8240..2328d507 100644
--- a/MinecraftClient/Program.cs
+++ b/MinecraftClient/Program.cs
@@ -159,11 +159,10 @@ namespace MinecraftClient
                         if (Settings.AntiAFK_Enabled)         { handler.BotLoad(new Bots.AntiAFK(Settings.AntiAFK_Delay)); }
                         if (Settings.Hangman_Enabled)         { handler.BotLoad(new Bots.Pendu(Settings.Hangman_English)); }
                         if (Settings.Alerts_Enabled)          { handler.BotLoad(new Bots.Alerts()); }
-                        if (Settings.ChatLog_Enabled)         { handler.BotLoad(new Bots.ChatLog(Settings.ChatLog_File, Settings.ChatLog_Filter, Settings.ChatLog_DateTime)); }
-                        if (Settings.PlayerLog_Enabled)       { handler.BotLoad(new Bots.PlayerListLogger(Settings.PlayerLog_Delay, Settings.PlayerLog_File)); }
+                        if (Settings.ChatLog_Enabled)         { handler.BotLoad(new Bots.ChatLog(Settings.ChatLog_File.Replace("%username%", Settings.Username), Settings.ChatLog_Filter, Settings.ChatLog_DateTime)); }
+                        if (Settings.PlayerLog_Enabled)       { handler.BotLoad(new Bots.PlayerListLogger(Settings.PlayerLog_Delay, Settings.PlayerLog_File.Replace("%username%", Settings.Username))); }
                         if (Settings.AutoRelog_Enabled)       { handler.BotLoad(new Bots.AutoRelog(Settings.AutoRelog_Delay, Settings.AutoRelog_Retries)); }
-                        if (Settings.StartupScript_Enabled)   { handler.BotLoad(new Bots.Script(Settings.StartupScript_ScriptFile)); Settings.StartupScript_Enabled = false; }
-                        if (Settings.ScriptScheduler_Enabled) { handler.BotLoad(new Bots.ScriptScheduler(Settings.ScriptScheduler_TasksFile)); }
+                        if (Settings.ScriptScheduler_Enabled) { handler.BotLoad(new Bots.ScriptScheduler(Settings.ScriptScheduler_TasksFile.Replace("%username%", Settings.Username))); }
                         if (Settings.RemoteCtrl_Enabled)      { handler.BotLoad(new Bots.RemoteControl()); }
 
                         //Start the main TCP client
diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs
index e0061b16..fb032406 100644
--- a/MinecraftClient/Settings.cs
+++ b/MinecraftClient/Settings.cs
@@ -44,6 +44,7 @@ namespace MinecraftClient
 
         //Alerts Settings
         public static bool Alerts_Enabled = false;
+        public static bool Alerts_Beep_Enabled = true;
         public static string Alerts_MatchesFile = "alerts.txt";
         public static string Alerts_ExcludesFile = "alerts-exclude.txt";
 
@@ -64,10 +65,6 @@ namespace MinecraftClient
         public static int AutoRelog_Retries = 3;
         public static string AutoRelog_KickMessagesFile = "kickmessages.txt";
 
-        //Startup Script Settings
-        public static bool StartupScript_Enabled = false;
-        public static string StartupScript_ScriptFile = "script.txt";
-
         //Script Scheduler Settings
         public static bool ScriptScheduler_Enabled = false;
         public static string ScriptScheduler_TasksFile = "tasks.ini";
@@ -142,6 +139,7 @@ namespace MinecraftClient
                                                 case "enabled": Alerts_Enabled = str2bool(argValue); break;
                                                 case "alertsfile": Alerts_MatchesFile = argValue; break;
                                                 case "excludesfile": Alerts_ExcludesFile = argValue; break;
+                                                case "beeponalert": Alerts_Beep_Enabled = str2bool(argValue); break;
                                             }
                                             break;
 
@@ -239,6 +237,7 @@ namespace MinecraftClient
                 + "enabled=false\r\n"
                 + "alertsfile=alerts.txt\r\n"
                 + "excludesfile=alerts-exclude.txt\r\n"
+                + "beeponalert=true\r\n"
                 + "\r\n"
                 + "[AntiAFK]\r\n"
                 + "enabled=false\r\n"