diff --git a/pom.xml b/pom.xml
index 2de176b..9119b8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<packaging>jar</packaging>
 
 	<properties>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -21,9 +21,11 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.0</version>
 				<configuration>
-					<release>11</release>
+					<release>17</release>
 					<encoding>UTF-8</encoding>
-				</configuration>
+                    <source>17</source>
+                    <target>17</target>
+                </configuration>
 			</plugin>
 			<plugin>
 				<!-- Build an executable JAR -->
diff --git a/src/main/java/netneutrality/MusicBot.java b/src/main/java/netneutrality/MusicBot.java
index cc11e06..d784a11 100644
--- a/src/main/java/netneutrality/MusicBot.java
+++ b/src/main/java/netneutrality/MusicBot.java
@@ -6,7 +6,6 @@ import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.requests.GatewayIntent;
 
 import netneutrality.db.DBController;
-import netneutrality.handler.ConsoleHandler;
 import netneutrality.handler.EditHandler;
 import netneutrality.handler.NewCommandListener;
 import netneutrality.http.server.WebApi;
diff --git a/src/main/java/netneutrality/command/AbstractMusicCommand.java b/src/main/java/netneutrality/command/AbstractMusicCommand.java
index 7afcb52..3e89bdf 100644
--- a/src/main/java/netneutrality/command/AbstractMusicCommand.java
+++ b/src/main/java/netneutrality/command/AbstractMusicCommand.java
@@ -28,6 +28,6 @@ public abstract class AbstractMusicCommand extends AbstractCommand {
             return member.getRoles().contains(neededRole);
         }
 
-        return false;
+        return true;
     }
 }
diff --git a/src/main/java/netneutrality/command/basic/PingCommand.java b/src/main/java/netneutrality/command/basic/PingCommand.java
index 1ded4c0..42e2027 100644
--- a/src/main/java/netneutrality/command/basic/PingCommand.java
+++ b/src/main/java/netneutrality/command/basic/PingCommand.java
@@ -12,9 +12,8 @@ public class PingCommand extends AbstractCommand {
 	public String execute(MessageReceivedEvent event, String[] args) {
 		if (args.length == 0)
 			event.getChannel().sendMessage("Pong! [" + MusicBot.getJDA().getGatewayPing() + " ms]").queue();
-		
+
 		return null;
-		
 	}
 
 	@Override
diff --git a/src/main/java/netneutrality/command/music/JoinCommand.java b/src/main/java/netneutrality/command/music/JoinCommand.java
index 92dffce..c85555c 100644
--- a/src/main/java/netneutrality/command/music/JoinCommand.java
+++ b/src/main/java/netneutrality/command/music/JoinCommand.java
@@ -52,8 +52,9 @@ public class JoinCommand extends AbstractMusicCommand {
     @Override
     public String execute(MessageReceivedEvent event, String[] args) {
         Member member = event.getMember();
-        MusicManager player = MusicManager.get(event.getGuild());
+
         if (member.getVoiceState().inVoiceChannel()) {
+            MusicManager player = MusicManager.get(event.getGuild());
             VoiceChannel vChannel = member.getVoiceState().getChannel();
 
             if (!player.isConnected()) {
diff --git a/src/main/java/netneutrality/handler/NewCommandListener.java b/src/main/java/netneutrality/handler/NewCommandListener.java
index 75ad125..b150b2e 100644
--- a/src/main/java/netneutrality/handler/NewCommandListener.java
+++ b/src/main/java/netneutrality/handler/NewCommandListener.java
@@ -48,12 +48,14 @@ public class NewCommandListener extends ListenerAdapter {
         String msg = message.getContentDisplay().trim();
 
         if (msg.startsWith(Settings.getInstance().get("BOT_PREFIX", "$"))) {
-            msg = msg.substring(Settings.getInstance().get("BOT_PREFIX", "$").length());
+            msg = msg.substring(Settings.getInstance().get("BOT_PREFIX", "$").length()).trim();
             String cmd = msg.split(" ", 2)[0];
-            String[] args = msg.replaceFirst("(" + cmd + ")( )?", "").split(" ");
+            String[] args = msg.replaceFirst("(" + cmd + ")(\s)?", "").split("\s");
+
+            if (args.length == 1 && args[0].isEmpty())
+                args = new String[0];
 
             if (CommandManager.commands.containsKey(cmd) || CommandManager.commandsAlias.containsKey(cmd)) {
-
                 AbstractCommand c = CommandManager.commands.containsKey(cmd) ? CommandManager.commands.get(cmd) : CommandManager.commandsAlias.get(cmd);
 
                 if (Visibility.check(event.getChannel(), c.getVisibility())) {
@@ -66,7 +68,6 @@ public class NewCommandListener extends ListenerAdapter {
                     if (c.canBeExecutedBy(event.getGuild(), event.getMember())) {
                         c.execute(event, args);
                     }
-
                 }
             }
         } else {
diff --git a/src/main/java/netneutrality/handler/ratelimiter/MessageRateLimiterImpl.java b/src/main/java/netneutrality/handler/ratelimiter/MessageRateLimiterImpl.java
index 6a4bdbf..277c09d 100644
--- a/src/main/java/netneutrality/handler/ratelimiter/MessageRateLimiterImpl.java
+++ b/src/main/java/netneutrality/handler/ratelimiter/MessageRateLimiterImpl.java
@@ -15,7 +15,6 @@ package netneutrality.handler.ratelimiter;/*
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.TextChannel;
-import netneutrality.handler.ratelimiter.IMessageRateLimiter;
 
 import java.time.OffsetDateTime;