diff --git a/src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java
index 5e9c393..84a91a3 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java
@@ -10,8 +10,7 @@ public class LinkCommand implements Command {
     @Override
     public void executed(String[] args, CommandEvent event) {
         if (args.length == 0) event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
-        switch (args[0]) {
-
+        switch (args[0].toLowerCase()) {
             case "add":
                 if (args.length != 2) return;
                 String linkid = args[1];
diff --git a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java
index 364c149..cb37c27 100644
--- a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java
@@ -14,7 +14,7 @@ public class RebootCommand implements Command {
     @Override
     public void executed(String[] args, CommandEvent event) {
         if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
-            System.exit(69);
+            Runtime.getRuntime().exit(69);
         } else {
             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
         }
diff --git a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java
index e904e4c..14cfdd2 100644
--- a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java
@@ -16,7 +16,7 @@ public class ShutdownCommand implements Command {
             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("Shutdown").build()).queue();
             event.getJDA().getShardManager().shutdown();
             System.out.println("Bot shut down via Command...");
-            System.exit(0);
+            Runtime.getRuntime().exit(69);
         } else {
             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
         }
diff --git a/src/main/java/com/bbn/hadder/listener/LinkListener.java b/src/main/java/com/bbn/hadder/listener/LinkListener.java
index 5981d05..968c173 100644
--- a/src/main/java/com/bbn/hadder/listener/LinkListener.java
+++ b/src/main/java/com/bbn/hadder/listener/LinkListener.java
@@ -15,7 +15,7 @@ import java.util.ArrayList;
 
 public class LinkListener extends ListenerAdapter {
 
-    Rethink rethink;
+    private Rethink rethink;
 
     public LinkListener(Rethink rethink) {
         this.rethink = rethink;
@@ -26,44 +26,38 @@ public class LinkListener extends ListenerAdapter {
         event.getChannel().retrieveMessageById(event.getMessageId()).queue(
                 msg -> {
                     if (event.getMember().hasPermission(Permission.MANAGE_CHANNEL)) {
-                        if (!event.getMember().getUser().equals(event.getJDA().getSelfUser())) {
-                            if (msg.getAuthor().equals(event.getJDA().getSelfUser())) {
-                                if (msg.getEmbeds().size() == 1) {
-                                    if (msg.getEmbeds().get(0).getFooter() == null) {
-                                        if (msg.getEmbeds().get(0).getTitle().endsWith(") wants to link guilds!")) {
-                                            String requestguild = msg.getEmbeds().get(0).getTitle().replaceAll("\\) wants to link guilds!", "");
-                                            String requestguildid = null;
-                                            for (int i = requestguild.length() - 1; i >= 0; i--) {
-                                                if (String.valueOf(requestguild.charAt(i)).equals("(")) {
-                                                    requestguildid = requestguild.substring(i + 1);
-                                                    break;
-                                                }
-                                            }
-                                            if (requestguildid != null) {
-                                                if (event.getReactionEmote().getName().equals("✅")) {
-                                                    rethink.addLinkedGuild(event.getGuild().getId(), requestguildid);
-                                                    rethink.addLinkedGuild(requestguildid, event.getGuild().getId());
+                        if (!event.getMember().getUser().equals(event.getJDA().getSelfUser()) && msg.getAuthor().equals(event.getJDA().getSelfUser()) && msg.getEmbeds().size() == 1 && msg.getEmbeds().get(0).getFooter() == null && msg.getEmbeds().get(0).getTitle().endsWith(") wants to link guilds!")) {
+                            String requestguild = msg.getEmbeds().get(0).getTitle().replaceAll("\\) wants to link guilds!", "");
+                            String requestguildid = null;
+                            for (int i = requestguild.length() - 1; i >= 0; i--) {
+                                if (String.valueOf(requestguild.charAt(i)).equals("(")) {
+                                    requestguildid = requestguild.substring(i + 1);
+                                    break;
+                                }
+                            }
+                            if (requestguildid != null) {
+                                if (event.getReactionEmote().getName().equals("✅")) {
+                                    rethink.addLinkedGuild(event.getGuild().getId(), requestguildid);
+                                    rethink.addLinkedGuild(requestguildid, event.getGuild().getId());
 
-                                                    msg.delete().queue();
+                                    msg.delete().queue();
 
-                                                    MessageEmbed msgembed = new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                                                            .setTitle("Guilds linked!").setDescription("The Guild allowed the link. Have fun!").build();
-                                                    event.getChannel().sendMessage(msgembed).queue();
-                                                    event.getJDA().getTextChannelById(rethink.getLinkChannel(requestguildid)).sendMessage(msgembed).queue();
-                                                } else if (event.getReactionEmote().getName().equals("❌")) {
-                                                    msg.delete().queue();
+                                    MessageEmbed msgembed = new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
+                                            .setTitle("Guilds linked!").setDescription("The Guild allowed the link. Have fun!").build();
+                                    event.getChannel().sendMessage(msgembed).queue();
+                                    event.getJDA().getTextChannelById(rethink.getLinkChannel(requestguildid)).sendMessage(msgembed).queue();
+                                } else if (event.getReactionEmote().getName().equals("❌")) {
+                                    msg.delete().queue();
 
-                                                    MessageEmbed msgembed = new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                                                            .setTitle("Guild linking denied.").setDescription("The Guild denied the link. :(").build();
-                                                    event.getChannel().sendMessage(msgembed).queue();
-                                                    event.getJDA().getTextChannelById(rethink.getLinkChannel(requestguildid)).sendMessage(msgembed).queue();
-                                                }
-                                            }
-                                        }
-                                    }
+                                    MessageEmbed msgembed = new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
+                                            .setTitle("Guild linking denied.").setDescription("The Guild denied the linking. :(").build();
+                                    event.getChannel().sendMessage(msgembed).queue();
+                                    event.getJDA().getTextChannelById(rethink.getLinkChannel(requestguildid)).sendMessage(msgembed).queue();
                                 }
                             }
                         }
+                    } else {
+                        event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
                     }
                 }
         );
diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
index f0b4b40..8672e28 100644
--- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
+++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
@@ -15,25 +15,22 @@ import java.time.Instant;
 public class PrivateMessageListener extends ListenerAdapter {
 
     public void onMessageReceived(MessageReceivedEvent event) {
-        if (event.isFromType(ChannelType.PRIVATE)) {
-            if (!event.getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) {
+        if (event.isFromType(ChannelType.PRIVATE) && !event.getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) {
+            PrivateChannel Skidder = event.getJDA().getUserById("477141528981012511").openPrivateChannel().complete();
+            PrivateChannel Hax = event.getJDA().getUserById("261083609148948488").openPrivateChannel().complete();
 
-                PrivateChannel Skidder = event.getJDA().getUserById("477141528981012511").openPrivateChannel().complete();
-                PrivateChannel Hax = event.getJDA().getUserById("261083609148948488").openPrivateChannel().complete();
-
-                Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                        .setTitle("New DM by " + event.getAuthor().getAsTag())
-                        .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
-                        .setDescription(event.getMessage().getContentRaw())
-                        .setTimestamp(Instant.now())
-                        .build()).queue();
-                Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                        .setTitle("New DM by " + event.getAuthor().getAsTag())
-                        .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
-                        .setDescription(event.getMessage().getContentRaw())
-                        .setTimestamp(Instant.now())
-                        .build()).queue();
-            }
+            Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
+                    .setTitle("New DM by " + event.getAuthor().getAsTag())
+                    .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
+                    .setDescription(event.getMessage().getContentRaw())
+                    .setTimestamp(Instant.now())
+                    .build()).queue();
+            Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
+                    .setTitle("New DM by " + event.getAuthor().getAsTag())
+                    .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
+                    .setDescription(event.getMessage().getContentRaw())
+                    .setTimestamp(Instant.now())
+                    .build()).queue();
         }
     }
 }