diff --git a/Test_Merge/ConfigurationTool.cs b/Test_Merge/ConfigurationTool.cs
index acdd023..4d51bb2 100644
--- a/Test_Merge/ConfigurationTool.cs
+++ b/Test_Merge/ConfigurationTool.cs
@@ -27,14 +27,25 @@ namespace Test_Merge
             MainZone = new Zone(fullImage, mainZoneDimensions,"Main");
             AutoCalibrate();
         }
+        /// <summary>
+        /// Resets the main zone
+        /// </summary>
         public void ResetMainZone()
         {
             MainZone.ResetZones();
         }
+        /// <summary>
+        /// Reset the windows
+        /// </summary>
         public void ResetWindows()
         {
             MainZone.ResetWindows();
         }
+        /// <summary>
+        /// Save the current config in a JSON file stored in /Presets/
+        /// </summary>
+        /// <param name="drivers">A list of all the drivers in the GP. IMPORTANT, they need to ALL be mentionned or the program wont be able to detect the missing ones and will F up everything</param>
+        /// <param name="configName">The name the config should have</param>
         public void SaveToJson(List<string> drivers, string configName)
         {
             string JSON = "";
@@ -77,6 +88,11 @@ namespace Test_Merge
 
             File.WriteAllText(path, JSON);
         }
+        /// <summary>
+        /// Adds a window in the windows list
+        /// Be carefull of the order. It cant be random or it will crash. The programm expect the first to be position, second Gap to leader etc...
+        /// </summary>
+        /// <param name="rectangles">The bounds of the window</param>
         public void AddWindows(List<Rectangle> rectangles)
         {
             foreach (Zone driverZone in MainZone.Zones)
@@ -127,6 +143,9 @@ namespace Test_Merge
                 }
             }
         }
+        /// <summary>
+        /// This will automatically create all the driver zones at the correct places if the main zone has been weel positionned
+        /// </summary>
         public void AutoCalibrate()
         {
             List<Rectangle> detectedText = new List<Rectangle>();
diff --git a/Test_Merge/DriverDrsWindow.cs b/Test_Merge/DriverDrsWindow.cs
index 5d9cecd..ba06736 100644
--- a/Test_Merge/DriverDrsWindow.cs
+++ b/Test_Merge/DriverDrsWindow.cs
@@ -23,6 +23,10 @@ namespace Test_Merge
         {
             Name = "DRS";
         }
+        /// <summary>
+        /// Method that will decode the content of the window
+        /// </summary>
+        /// <returns></returns>
         public override async Task<object> DecodePng()
         {
             bool result = false;
@@ -35,6 +39,10 @@ namespace Test_Merge
 
             return result;
         }
+        /// <summary>
+        /// Method that will get the green pixel proportion in the image, this can be used to determin if the DRS has been actuated
+        /// </summary>
+        /// <returns>The number of clearely green pixels</returns>
         private unsafe int GetGreenPixels()
         {
             int tot = 0;
@@ -69,6 +77,10 @@ namespace Test_Merge
 
             return tot;
         }
+        /// <summary>
+        /// This method is used to lock on where exactly the DRS window is
+        /// </summary>
+        /// <returns>Returns a rectangle containing the DRS</returns>
         public Rectangle GetBox()
         {
             var tessImage = Pix.LoadFromMemory(ImageToByte(WindowImage));
diff --git a/Test_Merge/DriverPositionWindow.cs b/Test_Merge/DriverPositionWindow.cs
index 4202a8a..fb2379f 100644
--- a/Test_Merge/DriverPositionWindow.cs
+++ b/Test_Merge/DriverPositionWindow.cs
@@ -1,4 +1,10 @@
-using System;
+/// Author : Maxime Rohmer
+/// Date : 08/05/2023
+/// File : DriverPosition.cs
+/// Brief : Window containing infos about the position of a driver.
+/// Version : 0.1
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/Test_Merge/F1TVEmulator.cs b/Test_Merge/F1TVEmulator.cs
index 8883e46..fc1677c 100644
--- a/Test_Merge/F1TVEmulator.cs
+++ b/Test_Merge/F1TVEmulator.cs
@@ -39,6 +39,9 @@ namespace Test_Merge
             GrandPrixUrl = grandPrixUrl;
             Ready = false;
         }
+        /// <summary>
+        /// Will start the python programm that runs the Cookie Recovering
+        /// </summary>
         private void StartCookieRecovering()
         {
             string scriptPath = PYTHON_COOKIE_RETRIEVAL_FILENAME;
@@ -51,6 +54,13 @@ namespace Test_Merge
             string output = process.StandardOutput.ReadToEnd();
             process.WaitForExit();
         }
+        /// <summary>
+        /// Method that will recover the needed cookies in the DB
+        /// </summary>
+        /// <param name="host"> The host of the wanted cookie ex: ./formula1.com</param>
+        /// <param name="name">The name of the wanted cookie ex: login</param>
+        /// <returns>returns the value of the cookie if it has been found</returns>
+        /// <exception cref="InvalidOperationException"></exception>
         public string GetCookie(string host, string name)
         {
             StartCookieRecovering();
@@ -88,6 +98,10 @@ namespace Test_Merge
 
             return value;
         }
+        /// <summary>
+        /// Starts the headless browser
+        /// </summary>
+        /// <returns>Error code 1xx</returns>
         public async Task<int> Start()
         {
             Ready = false;
@@ -248,6 +262,11 @@ namespace Test_Merge
             Ready = true;
             return 0;
         }
+        /// <summary>
+        /// Takes a screenshot of what the headless browser is displaying
+        /// </summary>
+        /// <param name="name">Optional ! The name of the picture so it can be saved</param>
+        /// <returns>Returns the screenshot in the bitmap format</returns>
         public Bitmap Screenshot(string name = "TEST")
         {
             Bitmap result = new Bitmap(4242, 6969);
@@ -273,11 +292,17 @@ namespace Test_Merge
             }
             return result;
         }
+        /// <summary>
+        /// Stops the Emulation. Note: if you plan to start it again please use ResetDriver() instead
+        /// </summary>
         public void Stop()
         {
             Ready = false;
             Driver.Dispose();
         }
+        /// <summary>
+        /// Resets the emulation
+        /// </summary>
         public void ResetDriver()
         {
             Ready = false;
diff --git a/Test_Merge/Settings.Designer.cs b/Test_Merge/Settings.Designer.cs
index b3ed9e8..efd0f5e 100644
--- a/Test_Merge/Settings.Designer.cs
+++ b/Test_Merge/Settings.Designer.cs
@@ -218,7 +218,7 @@
             // 
             // btnResetDriver
             // 
-            this.btnResetDriver.Location = new System.Drawing.Point(113, 22);
+            this.btnResetDriver.Location = new System.Drawing.Point(855, 17);
             this.btnResetDriver.Name = "btnResetDriver";
             this.btnResetDriver.Size = new System.Drawing.Size(101, 33);
             this.btnResetDriver.TabIndex = 2;
diff --git a/Test_Merge/Settings.cs b/Test_Merge/Settings.cs
index 59c5085..c33f930 100644
--- a/Test_Merge/Settings.cs
+++ b/Test_Merge/Settings.cs
@@ -16,6 +16,7 @@ namespace Test_Merge
         private string _grandPrixUrl = "";
         private string _grandPrixName = "";
         private int _grandPrixYear = 2000;
+        private string _selectedConfigFile;
         private List<string> _driverList = new List<string>();
 
         private F1TVEmulator Emulator = null;
@@ -35,6 +36,7 @@ namespace Test_Merge
         public string GrandPrixName { get => _grandPrixName; private set => _grandPrixName = value; }
         public int GrandPrixYear { get => _grandPrixYear; private set => _grandPrixYear = value; }
         public List<string> DriverList { get => _driverList; private set => _driverList = value; }
+        public string SelectedConfigFile { get => _selectedConfigFile;private set => _selectedConfigFile = value; }
 
         public Settings()
         {
@@ -398,11 +400,14 @@ namespace Test_Merge
             {
                 try
                 {
-                    Reader reader = new Reader(lsbPresets.Items[lsbPresets.SelectedIndex].ToString(), (Bitmap)pbxMain.Image,false);
+                    string fileName = lsbPresets.Items[lsbPresets.SelectedIndex].ToString();
+                    Reader reader = new Reader(fileName, (Bitmap)pbxMain.Image,false);
                     //MainZones #0 is the big main zone containing driver zones
                     Config = new ConfigurationTool((Bitmap)pbxMain.Image, reader.MainZones[0].Bounds);
                     Config.MainZone = reader.MainZones[0];
                     DriverList = reader.Drivers;
+
+                    SelectedConfigFile = fileName;
                 }
                 catch (Exception ex)
                 {