diff --git a/src/main/java/fr/Skydust/JdrBot/JdrBot.java b/src/main/java/fr/Skydust/JdrBot/JdrBot.java
index b2c8d25..bf407ee 100755
--- a/src/main/java/fr/Skydust/JdrBot/JdrBot.java
+++ b/src/main/java/fr/Skydust/JdrBot/JdrBot.java
@@ -17,7 +17,7 @@ import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
 
 public class JdrBot {
-	public static String Version = "2.61";
+	public static String Version = "2.62";
 
 	public static JDA jda;
 	public static LocalDateTime basedate;
diff --git a/src/main/java/fr/Skydust/JdrBot/JdrBotListener.java b/src/main/java/fr/Skydust/JdrBot/JdrBotListener.java
index 8c1ee33..759df22 100755
--- a/src/main/java/fr/Skydust/JdrBot/JdrBotListener.java
+++ b/src/main/java/fr/Skydust/JdrBot/JdrBotListener.java
@@ -15,7 +15,6 @@ import net.dv8tion.jda.api.events.user.update.UserUpdateOnlineStatusEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
 public class JdrBotListener extends ListenerAdapter {
-	
 	Random r = new Random();
 	
 	@Override
diff --git a/src/main/java/fr/Skydust/JdrBot/audio/TrackScheduler.java b/src/main/java/fr/Skydust/JdrBot/audio/TrackScheduler.java
index 4f78b3c..cc49278 100755
--- a/src/main/java/fr/Skydust/JdrBot/audio/TrackScheduler.java
+++ b/src/main/java/fr/Skydust/JdrBot/audio/TrackScheduler.java
@@ -35,7 +35,6 @@ public class TrackScheduler extends AudioEventAdapter {
 				System.out.println("Launching track:"+track.getInfo().title);
 			} else {
 				stop();
-				//am.closeAudioConnection();
 			}
 		}
 	}
diff --git a/src/main/java/fr/Skydust/JdrBot/cmds/Emote.java b/src/main/java/fr/Skydust/JdrBot/cmds/Emote.java
index 86b58e8..400797c 100755
--- a/src/main/java/fr/Skydust/JdrBot/cmds/Emote.java
+++ b/src/main/java/fr/Skydust/JdrBot/cmds/Emote.java
@@ -15,7 +15,7 @@ public class Emote extends Command {
     public void call(GuildMessageReceivedEvent e) {
         String[] args = Arrays.copyOfRange(e.getMessage().getContentRaw().split(" "), 1, e.getMessage().getContentRaw().split(" ").length);
 
-        String str = (String)args[0];
+        String str = args[0];
         if(str.matches("<:.*:\\d+>"))
         {
             String id = str.replaceAll("<:.*:(\\d+)>", "$1");
diff --git a/src/main/java/fr/Skydust/JdrBot/cmds/LastTimeOnline.java b/src/main/java/fr/Skydust/JdrBot/cmds/LastTimeOnline.java
index 7667223..7fe3869 100755
--- a/src/main/java/fr/Skydust/JdrBot/cmds/LastTimeOnline.java
+++ b/src/main/java/fr/Skydust/JdrBot/cmds/LastTimeOnline.java
@@ -12,7 +12,7 @@ import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 import net.dv8tion.jda.api.events.user.update.UserUpdateOnlineStatusEvent;
 
 public class LastTimeOnline extends Command {
-	static HashMap<String, LocalDateTime> AllUsers = new HashMap<String, LocalDateTime>();
+	static HashMap<String, LocalDateTime> AllUsers = new HashMap<>();
 
 	public LastTimeOnline() {
 		SetName("lasttimeonline|lto");
diff --git a/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoad.java b/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoad.java
index 8788056..45efb03 100755
--- a/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoad.java
+++ b/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoad.java
@@ -18,7 +18,7 @@ public class FLoad extends Command {
 
     @Override
     public void call(GuildMessageReceivedEvent e) {
-        if(e.getGuild().getMember(e.getAuthor()).getVoiceState().getChannel() != null) {
+        if(e.getMember().getVoiceState().getChannel() != null) {
             String args = StringUtils.join(Arrays.copyOfRange(e.getMessage().getContentRaw().split(" "), 1, e.getMessage().getContentRaw().split(" ").length), " ");
 
             e.getGuild().getAudioManager().openAudioConnection(e.getMember().getVoiceState().getChannel());
diff --git a/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoadLoop.java b/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoadLoop.java
index 522c05d..db22f02 100755
--- a/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoadLoop.java
+++ b/src/main/java/fr/Skydust/JdrBot/cmds/playmusic/FLoadLoop.java
@@ -18,7 +18,7 @@ public class FLoadLoop extends Command {
 
     @Override
     public void call(GuildMessageReceivedEvent e) {
-        if(e.getGuild().getMember(e.getAuthor()).getVoiceState().getChannel() != null) {
+        if(e.getMember().getVoiceState().getChannel() != null) {
             String args = StringUtils.join(Arrays.copyOfRange(e.getMessage().getContentRaw().split(" "), 1, e.getMessage().getContentRaw().split(" ").length)," ");
 
             e.getGuild().getAudioManager().openAudioConnection(e.getMember().getVoiceState().getChannel());