diff --git a/Dockerfile b/Dockerfile
index 79fd7f6..62f7da7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,12 +18,12 @@ RUN apk add --no-cache openjdk8 curl && \
 RUN wget -O /untisbot-discord/lib/logback-core.jar https://repo1.maven.org/maven2/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar && \
     wget -O /untisbot-discord/lib/logback-classic.jar https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar && \
     wget -O /untisbot-discord/lib/mariadb-java-client.jar https://downloads.mariadb.com/Connectors/java/connector-java-2.7.0/mariadb-java-client-2.7.0.jar && \
-    wget -O /untisbot-discord/lib/untis4j.jar $(curl -s https://api.github.com/repos/ByteDream/untis4j/releases/latest | grep "browser_download_url" | grep "withDependencies.jar" | cut -d '"' -f 4) && \
-    wget -O /untisbot-discord/lib/JDA.jar $(curl -s https://api.github.com/repos/DV8FromTheWorld/JDA/releases/latest | grep "browser_download_url" | grep "withDependencies-min.jar" | cut -d '"' -f 4)
+    wget -O /untisbot-discord/lib/untis4j.jar "$(curl -s https://api.github.com/repos/ByteDream/untis4j/releases/latest | grep "browser_download_url" | grep "withDependencies.jar" | cut -d '"' -f 4)" && \
+    wget -O /untisbot-discord/lib/JDA.jar "$(curl -s https://api.github.com/repos/DV8FromTheWorld/JDA/releases/latest | grep "browser_download_url" | grep "withDependencies-min.jar" | cut -d '"' -f 4)"
 
-ADD dockerfiles/run.sh /untisbot-discord/
-ADD dockerfiles/database.sql /untisbot-discord/
-ADD src/ /untisbot-discord/src
+COPY dockerfiles/run.sh /untisbot-discord/
+COPY dockerfiles/database.sql /untisbot-discord/
+COPY src/ /untisbot-discord/src
 
 EXPOSE 3306
 
diff --git a/dockerfiles/run.sh b/dockerfiles/run.sh
index a55e75c..83b45fd 100755
--- a/dockerfiles/run.sh
+++ b/dockerfiles/run.sh
@@ -11,4 +11,4 @@ mariadb --user=root --password="$MYSQL_ROOT_PASSWORD" -h 127.0.0.1 Untis < "/unt
 cp -r /untisbot-discord/src/* /untisbot-discord/out/
 rm -r $(find /untisbot-discord/out/ -name '*.java')
 
-java -Dfile.encoding=UTF-8 -cp "/untisbot-discord/out:/untisbot-discord/lib/*" org.bytedream.untisbot.Main mariadb token=$token user=root password=$MYSQL_ROOT_PASSWORD encrypt=$encrypt
\ No newline at end of file
+java -Dfile.encoding=UTF-8 -cp "/untisbot-discord/out:/untisbot-discord/lib/*" org.bytedream.untisbot.Main mariadb token="$token" user=root password="$MYSQL_ROOT_PASSWORD" encrypt="$encrypt"
\ No newline at end of file
diff --git a/src/org/bytedream/untisbot/Main.java b/src/org/bytedream/untisbot/Main.java
index bb95612..6a870a6 100644
--- a/src/org/bytedream/untisbot/Main.java
+++ b/src/org/bytedream/untisbot/Main.java
@@ -126,7 +126,7 @@ public class Main {
                         logger.info("Set custom language file");
                 }
             } catch (ArrayIndexOutOfBoundsException ignore) {
-                if (arg.trim().toLowerCase().equals("mariadb")) {
+                if (arg.trim().equalsIgnoreCase("mariadb")) {
                     storeType = StoreType.MARIADB;
                     logger.info("Using mariadb for data storage");
                 }
diff --git a/src/org/bytedream/untisbot/Utils.java b/src/org/bytedream/untisbot/Utils.java
index 8403475..d6cff2f 100644
--- a/src/org/bytedream/untisbot/Utils.java
+++ b/src/org/bytedream/untisbot/Utils.java
@@ -16,10 +16,11 @@ public class Utils {
      * @since 1.0
      */
     public static String advancedFormat(String stringToFormat, Map<String, Object> args) {
+        String formattedString = stringToFormat;
         for (Map.Entry<String, Object> entry : args.entrySet()) {
-            stringToFormat = stringToFormat.replace("{" + entry.getKey() + "}", entry.getValue().toString());
+            formattedString = formattedString.replace("{" + entry.getKey() + "}", entry.getValue().toString());
         }
-        return stringToFormat;
+        return formattedString;
     }
 
     /**
diff --git a/src/org/bytedream/untisbot/data/DataConnector.java b/src/org/bytedream/untisbot/data/DataConnector.java
index 3a52487..60449b8 100644
--- a/src/org/bytedream/untisbot/data/DataConnector.java
+++ b/src/org/bytedream/untisbot/data/DataConnector.java
@@ -4,8 +4,8 @@ import org.bytedream.untisbot.Crypt;
 import org.bytedream.untisbot.Main;
 
 import java.security.GeneralSecurityException;
-import java.sql.*;
 import java.sql.Date;
+import java.sql.*;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
diff --git a/src/org/bytedream/untisbot/discord/DiscordCommandListener.java b/src/org/bytedream/untisbot/discord/DiscordCommandListener.java
index b9e8cd6..06b2afe 100644
--- a/src/org/bytedream/untisbot/discord/DiscordCommandListener.java
+++ b/src/org/bytedream/untisbot/discord/DiscordCommandListener.java
@@ -33,7 +33,6 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
diff --git a/src/org/bytedream/untisbot/untis/CheckCallback.java b/src/org/bytedream/untisbot/untis/CheckCallback.java
index 43324cf..3775663 100644
--- a/src/org/bytedream/untisbot/untis/CheckCallback.java
+++ b/src/org/bytedream/untisbot/untis/CheckCallback.java
@@ -2,7 +2,6 @@ package org.bytedream.untisbot.untis;
 
 import org.bytedream.untis4j.responseObjects.Timetable;
 
-import java.sql.Time;
 import java.time.LocalDate;
 import java.util.ArrayList;
 
diff --git a/src/org/bytedream/untisbot/untis/TimetableChecker.java b/src/org/bytedream/untisbot/untis/TimetableChecker.java
index d2ce439..aaa48df 100644
--- a/src/org/bytedream/untisbot/untis/TimetableChecker.java
+++ b/src/org/bytedream/untisbot/untis/TimetableChecker.java
@@ -1,11 +1,8 @@
 package org.bytedream.untisbot.untis;
 
-import org.bytedream.untis4j.LoginException;
-import org.bytedream.untis4j.RequestManager;
 import org.bytedream.untis4j.Session;
 import org.bytedream.untis4j.UntisUtils;
 import org.bytedream.untis4j.responseObjects.Timetable;
-import org.bytedream.untisbot.Main;
 
 import java.io.IOException;
 import java.time.LocalDate;
@@ -113,6 +110,8 @@ public class TimetableChecker {
                             cancelledLesson.add(lesson);
                         }
                         break;
+                    default:
+                        // this isn't implemented yet
                 }
             } else if (lesson.getCode() == UntisUtils.LessonCode.IRREGULAR && timetable.searchByStartTime(lesson.getStartTime()).size() == 1 && !allIgnoredLessons.contains(lesson)) {
                 // lesson is maybe moved