diff --git a/src/main/java/codes/ztereohype/ztereomusic/audio/CustomAudioLoadResultHandler.java b/src/main/java/codes/ztereohype/ztereomusic/audio/CustomAudioLoadResultHandler.java
index b16e60d..a4527a4 100644
--- a/src/main/java/codes/ztereohype/ztereomusic/audio/CustomAudioLoadResultHandler.java
+++ b/src/main/java/codes/ztereohype/ztereomusic/audio/CustomAudioLoadResultHandler.java
@@ -4,9 +4,7 @@ import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageChannel;
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 public class CustomAudioLoadResultHandler implements AudioLoadResultHandler {
     private final TrackManager trackManager;
diff --git a/src/main/java/codes/ztereohype/ztereomusic/audio/TrackManagers.java b/src/main/java/codes/ztereohype/ztereomusic/audio/TrackManagers.java
index 33f3ebc..6d17424 100644
--- a/src/main/java/codes/ztereohype/ztereomusic/audio/TrackManagers.java
+++ b/src/main/java/codes/ztereohype/ztereomusic/audio/TrackManagers.java
@@ -1,19 +1,17 @@
 package codes.ztereohype.ztereomusic.audio;
 
 import codes.ztereohype.ztereomusic.ZtereoMUSIC;
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.MessageChannel;
 import net.dv8tion.jda.api.entities.VoiceChannel;
 import net.dv8tion.jda.api.managers.AudioManager;
 
 import javax.annotation.Nullable;
-import java.util.Objects;
 
 public class TrackManagers {
-    //todo: separate infochannel setting from creation or getting, maybe remove guildtrackmanager should accept a tracc manager?
+    //note: maybe make infoChannel an optional? not sure how to make this better, ask rep
     @Nullable
-    public static TrackManager getGuildTrackManager(Guild guild, MessageChannel infoChannel) {
+    public static TrackManager getGuildTrackManager(Guild guild, @Nullable MessageChannel infoChannel) {
         long guildId = guild.getIdLong();
 
         TrackManager trackManager = ZtereoMUSIC.getInstance().getGuildTrackManagerMap().get(guildId);
diff --git a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Disconnect.java b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Disconnect.java
index ada53a1..406763b 100644
--- a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Disconnect.java
+++ b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Disconnect.java
@@ -1,14 +1,11 @@
 package codes.ztereohype.ztereomusic.command.commands;
 
-import codes.ztereohype.ztereomusic.ZtereoMUSIC;
-import codes.ztereohype.ztereomusic.audio.TrackManager;
 import codes.ztereohype.ztereomusic.audio.TrackManagers;
 import codes.ztereohype.ztereomusic.command.Command;
 import codes.ztereohype.ztereomusic.command.CommandMeta;
 import codes.ztereohype.ztereomusic.command.permissions.VoiceChecks;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.api.managers.AudioManager;
 
 public class Disconnect implements Command {
     private final CommandMeta meta;
diff --git a/src/main/java/codes/ztereohype/ztereomusic/command/permissions/VoiceChecks.java b/src/main/java/codes/ztereohype/ztereomusic/command/permissions/VoiceChecks.java
index 2fe6d5e..2abbed5 100644
--- a/src/main/java/codes/ztereohype/ztereomusic/command/permissions/VoiceChecks.java
+++ b/src/main/java/codes/ztereohype/ztereomusic/command/permissions/VoiceChecks.java
@@ -1,18 +1,13 @@
 package codes.ztereohype.ztereomusic.command.permissions;
 
 import codes.ztereohype.ztereomusic.audio.TrackManager;
-import codes.ztereohype.ztereomusic.audio.TrackManagers;
 import lombok.Getter;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.VoiceChannel;
-import net.dv8tion.jda.api.managers.AudioManager;
 
 import javax.annotation.Nullable;
 import java.util.Objects;
 
-// todo: make an actual good system
-// Since these permission checks basically need to run for every single voice-related command,
-// we just get the info we need... idk i need to think this through
 public enum VoiceChecks {
     BOT_CONNECTED(new Check() {
         @Override
diff --git a/src/main/java/codes/ztereohype/ztereomusic/listeners/CommandListener.java b/src/main/java/codes/ztereohype/ztereomusic/listeners/CommandListener.java
index e2dd601..cfd9201 100644
--- a/src/main/java/codes/ztereohype/ztereomusic/listeners/CommandListener.java
+++ b/src/main/java/codes/ztereohype/ztereomusic/listeners/CommandListener.java
@@ -1,15 +1,12 @@
 package codes.ztereohype.ztereomusic.listeners;
 
 import codes.ztereohype.ztereomusic.ZtereoMUSIC;
-import codes.ztereohype.ztereomusic.audio.TrackManager;
 import codes.ztereohype.ztereomusic.audio.TrackManagers;
 import codes.ztereohype.ztereomusic.command.Command;
-import codes.ztereohype.ztereomusic.command.permissions.Check;
 import codes.ztereohype.ztereomusic.command.permissions.VoiceChecks;
 import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import net.dv8tion.jda.api.managers.AudioManager;
 
 import javax.annotation.Nonnull;
 import java.util.Arrays;
@@ -60,6 +57,7 @@ public class CommandListener extends ListenerAdapter {
         try {
             command.execute(event, args);
         } catch (Exception e) {
+            //todo: nicer embed with error pls
             message.getChannel().sendMessage("uh oh something really bad happened and yeah so yeah everything is aborted and cancelled i give up this is too hard kthxbye").queue();
             throw e;
         }
diff --git a/src/main/java/codes/ztereohype/ztereomusic/listeners/vcLeaveListener.java b/src/main/java/codes/ztereohype/ztereomusic/listeners/VcLeaveListener.java
similarity index 87%
rename from src/main/java/codes/ztereohype/ztereomusic/listeners/vcLeaveListener.java
rename to src/main/java/codes/ztereohype/ztereomusic/listeners/VcLeaveListener.java
index 2da6580..75a6a26 100644
--- a/src/main/java/codes/ztereohype/ztereomusic/listeners/vcLeaveListener.java
+++ b/src/main/java/codes/ztereohype/ztereomusic/listeners/VcLeaveListener.java
@@ -1,7 +1,6 @@
 package codes.ztereohype.ztereomusic.listeners;
 
 import codes.ztereohype.ztereomusic.ZtereoMUSIC;
-import codes.ztereohype.ztereomusic.audio.TrackManager;
 import codes.ztereohype.ztereomusic.audio.TrackManagers;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
@@ -10,7 +9,7 @@ import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
 import javax.annotation.Nonnull;
 
-public class vcLeaveListener extends ListenerAdapter {
+public class VcLeaveListener extends ListenerAdapter {
     @Override
     public void onGuildVoiceLeave(@Nonnull GuildVoiceLeaveEvent event) {
         Guild guild = event.getGuild();