diff --git a/src/de/deadlocker8/budgetmaster/main/Main.java b/src/de/deadlocker8/budgetmaster/main/Main.java
index de459fc7283f353dffd55a22b23e6ef6b476d50c..8f4ddb54fb52f6c0ca65a16ada2851cd590d6dc4 100644
--- a/src/de/deadlocker8/budgetmaster/main/Main.java
+++ b/src/de/deadlocker8/budgetmaster/main/Main.java
@@ -1,7 +1,6 @@
 package de.deadlocker8.budgetmaster.main;
 
 import java.io.File;
-import java.util.Arrays;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
@@ -12,7 +11,7 @@ import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
-import logger.LogLevel;
+import logger.FileOutputMode;
 import logger.Logger;
 import tools.PathUtils;
 
@@ -46,26 +45,23 @@ public class Main extends Application
 			Logger.error(e);
 		}
 	}
-
-	public static void main(String[] args)
-	{
-		if(Arrays.asList(args).contains("debug"))
-		{
-			Logger.setLevel(LogLevel.ALL);
-			Logger.info("Running in Debug Mode");
-		}
-		else
-		{
-			Logger.setLevel(LogLevel.ERROR);			
-		}
-		
-		PathUtils.checkFolder(new File(PathUtils.getOSindependentPath() + bundle.getString("folder")));
-		File logFile = new File(PathUtils.getOSindependentPath() + bundle.getString("folder") + "/error.log");				
-		Logger.enableFileOutput(logFile);
 	
-		Logger.appInfo(bundle.getString("app.name"), bundle.getString("version.name"), bundle.getString("version.code"), bundle.getString("version.date"));
+	@Override
+	public void init() throws Exception
+	{	
+		Parameters params = getParameters();
+		String logLevelParam = params.getNamed().get("loglevel");		
+		Logger.setLevel(logLevelParam);	
 		
-		launch(args);
+		File logFolder = new File(PathUtils.getOSindependentPath() + bundle.getString("folder"));		
+		PathUtils.checkFolder(logFolder);
+		Logger.enableFileOutput(logFolder, System.out, System.err, FileOutputMode.COMBINED);
+		
+		Logger.appInfo(bundle.getString("app.name"), bundle.getString("version.name"), bundle.getString("version.code"), bundle.getString("version.date"));		
 	}
-	
+
+	public static void main(String[] args)
+	{				
+		launch(args);
+	}	
 }
\ No newline at end of file
diff --git a/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java b/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java
index 3d20eb6f577834bb4cc05b8674a495c8084e4ea8..cae8ee9afe0489a217d66b69c34cdd10da0053ea 100644
--- a/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java
+++ b/src/de/deadlocker8/budgetmasterserver/main/DatabaseHandler.java
@@ -30,7 +30,7 @@ public class DatabaseHandler
 	{
 		try
 		{
-			this.connection = DriverManager.getConnection(settings.getDatabaseUrl() + settings.getDatabaseName() + "?useLegacyDatetimeCode=false&serverTimezone=Europe/Berlin", settings.getDatabaseUsername(), settings.getDatabasePassword());
+			this.connection = DriverManager.getConnection(settings.getDatabaseUrl() + settings.getDatabaseName() + "?useLegacyDatetimeCode=false&serverTimezone=Europe/Berlin&autoReconnect=true&wait_timeout=86400", settings.getDatabaseUsername(), settings.getDatabasePassword());
 			new DatabaseCreator(connection, settings);
 			Logger.info("Successfully initialized database (" + settings.getDatabaseUrl() + settings.getDatabaseName() + ")");
 		}
diff --git a/src/de/deadlocker8/budgetmasterserver/main/Main.java b/src/de/deadlocker8/budgetmasterserver/main/Main.java
index 995f4e11b3ccfab77f7dd22b9c487ad83b414c3a..d2df69c2cf433a2d0254a7b045df54373dca9965 100644
--- a/src/de/deadlocker8/budgetmasterserver/main/Main.java
+++ b/src/de/deadlocker8/budgetmasterserver/main/Main.java
@@ -9,8 +9,10 @@ import java.util.Locale;
 import java.util.ResourceBundle;
 
 import de.deadlocker8.budgetmasterserver.server.SparkServer;
+import logger.FileOutputMode;
 import logger.LogLevel;
 import logger.Logger;
+import tools.PathUtils;
 
 public class Main
 {
@@ -22,8 +24,9 @@ public class Main
 		Logger.appInfo(bundle.getString("app.name"), bundle.getString("version.name"), bundle.getString("version.code"), bundle.getString("version.date"));
 		try
 		{
-			File logFile = new File(Paths.get(SparkServer.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParent().toFile() + "/error.log");
-			Logger.enableFileOutput(logFile);
+			File logFolder = Paths.get(SparkServer.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParent().toFile();				
+			PathUtils.checkFolder(logFolder);
+			Logger.enableFileOutput(logFolder, System.out, System.err, FileOutputMode.COMBINED);
 		}
 		catch(URISyntaxException e1)
 		{