diff --git a/pom.xml b/pom.xml
index f930cad..804255e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>Hadder</groupId>
   <artifactId>Hadder</artifactId>
-  <version>1.3.11</version>
+  <version>1.3.14</version>
   <name>Hadder</name>
   <inceptionYear>2019</inceptionYear>
   <description>Hadder is a multi-purpose Discord bot.</description>
@@ -66,17 +66,17 @@
     <dependency>
       <groupId>net.dv8tion</groupId>
       <artifactId>JDA</artifactId>
-      <version>4.1.1_154</version>
+      <version>4.1.1_157</version>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <version>20190722</version>
+      <version>20200518</version>
     </dependency>
     <dependency>
       <groupId>com.rethinkdb</groupId>
       <artifactId>rethinkdb-driver</artifactId>
-      <version>2.4.3</version>
+      <version>2.4.4</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -91,12 +91,12 @@
     <dependency>
       <groupId>org.kohsuke</groupId>
       <artifactId>github-api</artifactId>
-      <version>1.111</version>
+      <version>1.112</version>
     </dependency>
     <dependency>
       <groupId>com.sedmelluq</groupId>
       <artifactId>lavaplayer</artifactId>
-      <version>1.3.48</version>
+      <version>1.3.49</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -146,7 +146,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.1.0</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java
index ab8edbe..9b26ccd 100644
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/com/bbn/hadder/Hadder.java
@@ -26,6 +26,7 @@ import com.bbn.hadder.commands.fun.*;
 import com.bbn.hadder.commands.settings.*;
 import com.bbn.hadder.commands.music.*;
 import com.bbn.hadder.core.*;
+import com.bbn.hadder.db.Rethink;
 import com.bbn.hadder.listener.*;
 import net.dv8tion.jda.api.OnlineStatus;
 import net.dv8tion.jda.api.entities.Activity;
@@ -98,7 +99,6 @@ public class Hadder {
                         new AvatarCommand(),
                         new EvalCommand(),
                         new JoinCommand(),
-                        new LeaveCommand(),
                         new GuildLeaveCommand(),
                         new MemeCommand(),
                         new InviteDetectCommand(),
diff --git a/src/main/java/com/bbn/hadder/commands/CommandEvent.java b/src/main/java/com/bbn/hadder/commands/CommandEvent.java
index 90b1d8b..73dc632 100644
--- a/src/main/java/com/bbn/hadder/commands/CommandEvent.java
+++ b/src/main/java/com/bbn/hadder/commands/CommandEvent.java
@@ -16,9 +16,9 @@
 
 package com.bbn.hadder.commands;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
+import com.bbn.hadder.db.RethinkUser;
 import com.bbn.hadder.audio.AudioManager;
 import com.bbn.hadder.commands.general.HelpCommand;
 import com.bbn.hadder.core.CommandHandler;
diff --git a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java
deleted file mode 100644
index d63cdb1..0000000
--- a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2019-2020 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bbn.hadder.commands.music;
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-
-public class LeaveCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent e) {
-        if (e.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) {
-            if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) {
-                e.getGuild().getAudioManager().closeAudioConnection();
-                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
-                        MessageEditor.MessageType.INFO,
-                        "commands.music.leave.success.title",
-                        "commands.music.leave.success.description")
-                        .build()).queue();
-            } else {
-                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                        "commands.music.leave.error.channel.title",
-                        "commands.music.leave.error.channel.description")
-                        .build()).queue();
-            }
-        } else {
-            e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
-                MessageEditor.MessageType.ERROR,
-                "commands.music.leave.error.connected.tile",
-                "commands.music.leave.error.connected.description")
-                    .build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"leave", "quit"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.music.leave.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}
diff --git a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java
index be1a5b1..f7bd31c 100644
--- a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java
@@ -26,10 +26,14 @@ public class SkipCommand implements Command {
     public void executed(String[] args, CommandEvent e) {
         if (e.getAudioManager().hasPlayer(e.getGuild()) && !e.getAudioManager().getTrackManager(e.getGuild()).getQueuedTracks().isEmpty()) {
             if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) {
-                e.getAudioManager().forceSkipTrack(e);
-                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                        "commands.music.skip.success.title",
-                        "commands.music.skip.success.description").build()).queue();
+                if (!e.getAudioManager().getTrackManager(e.getGuild()).isLoop()) {
+                    e.getAudioManager().forceSkipTrack(e);
+                    e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                            "commands.music.skip.success.title",
+                            "commands.music.skip.success.description").build()).queue();
+                } else {
+                    e.getTextChannel().sendMessage("Get rekt lol Mach Loop aus noob").queue();
+                }
             } else {
                 e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
                         "commands.music.skip.error.connected.title",
diff --git a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java
index e11dfac..96a1811 100644
--- a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java
@@ -26,6 +26,7 @@ public class StopCommand implements Command {
     public void executed(String[] args, CommandEvent e) {
         if (e.getAudioManager().hasPlayer(e.getGuild()) && e.getAudioManager().getPlayer(e.getGuild()).getPlayingTrack() != null) {
             if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) {
+                e.getAudioManager().getTrackManager(e.getGuild()).setLoop(false);
                 e.getAudioManager().players.remove(e.getGuild().getId());
                 e.getAudioManager().getPlayer(e.getGuild()).destroy();
                 e.getAudioManager().getTrackManager(e.getGuild()).purgeQueue();
@@ -48,7 +49,7 @@ public class StopCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[]{"stop"};
+        return new String[]{"stop", "leave"};
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
index 50555a4..b097af1 100644
--- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
@@ -16,7 +16,7 @@
 
 package com.bbn.hadder.commands.owner;
 
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.RethinkUser;
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.core.Perm;
diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java
index 7ab130a..a5ecd97 100644
--- a/src/main/java/com/bbn/hadder/core/CommandHandler.java
+++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java
@@ -16,9 +16,9 @@
 
 package com.bbn.hadder.core;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
+import com.bbn.hadder.db.RethinkUser;
 import com.bbn.hadder.audio.AudioManager;
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/db/Rethink.java
similarity index 98%
rename from src/main/java/com/bbn/hadder/Rethink.java
rename to src/main/java/com/bbn/hadder/db/Rethink.java
index 069209f..6651a39 100644
--- a/src/main/java/com/bbn/hadder/Rethink.java
+++ b/src/main/java/com/bbn/hadder/db/Rethink.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder;
+package com.bbn.hadder.db;
 
 import com.bbn.hadder.core.Config;
 import com.rethinkdb.RethinkDB;
@@ -31,7 +31,7 @@ public class Rethink {
     private Connection conn;
     private Config config;
 
-    Rethink(Config config) {
+    public Rethink(Config config) {
         this.config = config;
     }
 
diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/db/RethinkServer.java
similarity index 97%
rename from src/main/java/com/bbn/hadder/RethinkServer.java
rename to src/main/java/com/bbn/hadder/db/RethinkServer.java
index e54dfd9..0993922 100644
--- a/src/main/java/com/bbn/hadder/RethinkServer.java
+++ b/src/main/java/com/bbn/hadder/db/RethinkServer.java
@@ -10,11 +10,11 @@
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ *  See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
-package com.bbn.hadder;
+package com.bbn.hadder.db;
 
 import org.json.JSONObject;
 
diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/db/RethinkUser.java
similarity index 95%
rename from src/main/java/com/bbn/hadder/RethinkUser.java
rename to src/main/java/com/bbn/hadder/db/RethinkUser.java
index 0579947..ba65bc3 100644
--- a/src/main/java/com/bbn/hadder/RethinkUser.java
+++ b/src/main/java/com/bbn/hadder/db/RethinkUser.java
@@ -10,11 +10,11 @@
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ *  See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
-package com.bbn.hadder;
+package com.bbn.hadder.db;
 
 import org.json.JSONObject;
 
diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java
index 286d320..0defad9 100644
--- a/src/main/java/com/bbn/hadder/listener/CommandListener.java
+++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java
@@ -16,9 +16,9 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
+import com.bbn.hadder.db.RethinkUser;
 import com.bbn.hadder.audio.AudioManager;
 import com.bbn.hadder.core.CommandHandler;
 import net.dv8tion.jda.api.EmbedBuilder;
diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java
index 91204ca..a35ce21 100644
--- a/src/main/java/com/bbn/hadder/listener/GuildListener.java
+++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java
@@ -16,7 +16,7 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
+import com.bbn.hadder.db.Rethink;
 import com.bbn.hadder.core.Config;
 import com.bbn.hadder.utils.BotList;
 import com.bbn.hadder.utils.MessageEditor;
diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
index ea00e93..69dddfd 100644
--- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
+++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
@@ -16,8 +16,8 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.entities.Message;
diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java
index 7fb9e11..2ac4e3d 100644
--- a/src/main/java/com/bbn/hadder/listener/MentionListener.java
+++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java
@@ -16,9 +16,9 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
+import com.bbn.hadder.db.RethinkUser;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
index fc258f9..8e94bbe 100644
--- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
+++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
@@ -16,8 +16,8 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkUser;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;
diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/com/bbn/hadder/listener/ReadyListener.java
index 51b3491..2262453 100644
--- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java
+++ b/src/main/java/com/bbn/hadder/listener/ReadyListener.java
@@ -16,7 +16,7 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
+import com.bbn.hadder.db.Rethink;
 import com.bbn.hadder.core.Config;
 import com.bbn.hadder.utils.BotList;
 import net.dv8tion.jda.api.entities.Guild;
diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java
index 8ee5fc4..a04662f 100644
--- a/src/main/java/com/bbn/hadder/listener/RulesListener.java
+++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java
@@ -16,8 +16,8 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java
index 2467ad5..060777b 100644
--- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java
+++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java
@@ -16,8 +16,8 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.MessageBuilder;
 import net.dv8tion.jda.api.entities.MessageReaction;
diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java
index c760b70..aac0d8c 100644
--- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java
+++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java
@@ -16,7 +16,7 @@
 
 package com.bbn.hadder.utils;
 
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.RethinkUser;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.User;
 
diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties
index 043a3f1..a68515b 100644
--- a/src/main/resources/Translations/Translations_en.properties
+++ b/src/main/resources/Translations/Translations_en.properties
@@ -223,13 +223,6 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel.
 commands.music.join.error.permission.title = No permission
 commands.music.join.error.permission.description = I am not allowed to join your voice channel.
 commands.music.join.help.description = Joins your voice channel.
-commands.music.leave.success.title = Successfully disconnected
-commands.music.leave.success.description = I successfully disconnected from the Voice Channel
-commands.music.leave.error.channel.title = No channel
-commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot.
-commands.music.leave.error.connected.tile = Not connected
-commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild
-commands.music.leave.help.description = Leaves your voice channel.
 commands.music.play.load.title = %extra% Now loading %extra%
 commands.music.play.load.description = Trying to load the song...
 commands.music.play.success.loading.title = %extra% Now playing %extra%