diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..fb66f54
--- /dev/null
+++ b/.DS_Store
Binary files differ
diff --git a/lists/safe_domains.txt b/lists/safe_domains.txt
index 1eb09fe..2c1a8ea 100644
--- a/lists/safe_domains.txt
+++ b/lists/safe_domains.txt
@@ -98,4 +98,7 @@
 jagrosh.com
 mhgh.info
 giveawaybot.party
-discord.pw
\ No newline at end of file
+discord.pw
+perditum.com
+abmanagement.al
+palera1n.lol
\ No newline at end of file
diff --git a/src/.DS_Store b/src/.DS_Store
new file mode 100644
index 0000000..8ea6517
--- /dev/null
+++ b/src/.DS_Store
Binary files differ
diff --git a/src/main/java/com/jagrosh/vortex/Constants.java b/src/main/java/com/jagrosh/vortex/Constants.java
index 66d8bb6..a5c975e 100644
--- a/src/main/java/com/jagrosh/vortex/Constants.java
+++ b/src/main/java/com/jagrosh/vortex/Constants.java
@@ -43,25 +43,25 @@
                                         Permission.VOICE_MUTE_OTHERS, Permission.NICKNAME_CHANGE, Permission.NICKNAME_MANAGE, Permission.VIEW_AUDIT_LOGS};
     public final static EnumSet<GatewayIntent> INTENTS = EnumSet.of(GatewayIntent.DIRECT_MESSAGES, GatewayIntent.GUILD_BANS, GatewayIntent.GUILD_INVITES, 
                                         GatewayIntent.GUILD_MEMBERS, GatewayIntent.GUILD_MESSAGES, GatewayIntent.GUILD_MESSAGE_REACTIONS, GatewayIntent.GUILD_VOICE_STATES);
-    public final static String SERVER_INVITE = "https://discord.gg/0p9LSGoRLu6Pet0k";
+    public final static String SERVER_INVITE = "https://discord.gg/pQNtuyT3TZ";
     //public final static String BOT_INVITE  = "https://discordapp.com/oauth2/authorize?client_id=240254129333731328&scope=bot&permissions="+Permission.getRaw(PERMISSIONS);
     // public final static String BOT_INVITE    = "https://discordapp.com/oauth2/authorize?client_id=169463754382114816&scope=bot&permissions="+Permission.getRaw(PERMISSIONS);
-    public final static String OWNER_ID      = "113156185389092864";
-    public final static String DONATION_LINK = "https://patreon.com/jagrosh";
+    public final static String OWNER_ID      = "507605578600808449";
+    public final static String DONATION_LINK = "https://frye.perditum.com/donate";
     
     public final static class Wiki
     {
-        public final static String PRIMARY_LINK = "https://jagrosh.com/vortex";
+        public final static String PRIMARY_LINK = "https://frye.perditum.com";
         
-        public final static String SHORT_WIKI     = "https://git.io/fxHam";
-        public final static String SHORT_COMMANDS = "https://git.io/vAr0G";
+        public final static String SHORT_WIKI     = "https://frye.perditum.com";
+        public final static String SHORT_COMMANDS = "https://frye.perditum.com/cmds";
         
-        public final static String WIKI_BASE    = "https://github.com/jagrosh/Vortex/wiki";
-        public final static String START        = WIKI_BASE + "/Getting-Started";
-        public final static String LOG_TIMEZONE = WIKI_BASE + "/Log-Timezone";
-        public final static String RAID_MODE    = WIKI_BASE + "/Raid-Mode";
-        public final static String COMMANDS     = WIKI_BASE + "/Commands";
-        public final static String AUTOMOD      = WIKI_BASE + "/Auto-Moderation";
-        public final static String VORTEX_PRO   = WIKI_BASE + "/Vortex-Pro";
+        public final static String WIKI_BASE    = "https://frye.perditum.com";
+        public final static String START        = WIKI_BASE + "/gettingstarted";
+        public final static String LOG_TIMEZONE = WIKI_BASE + "/log-timezone";
+        public final static String RAID_MODE    = WIKI_BASE + "/raid-mode";
+        public final static String COMMANDS     = WIKI_BASE + "/cmds";
+        public final static String AUTOMOD      = WIKI_BASE + "/automod";
+        public final static String VORTEX_PRO   = WIKI_BASE + "/frye-pro";
     }
 }
diff --git a/src/main/java/com/jagrosh/vortex/Emoji.java b/src/main/java/com/jagrosh/vortex/Emoji.java
index 60c3d50..ef2b1d6 100644
--- a/src/main/java/com/jagrosh/vortex/Emoji.java
+++ b/src/main/java/com/jagrosh/vortex/Emoji.java
@@ -22,11 +22,11 @@
 public class Emoji
 {
     // vortex general icons
-    public final static String VORTEX   = "<:vortex:850113634859483176>";
-    public final static String SUCCESS  = "<:vSuccess:850102850491121725>";
-    public final static String WARNING  = "<:vWarning:850102850855895110>";
-    public final static String ERROR    = "<:vError:850102850846457879>";
-    public final static String LOADING  = "<a:typing:850124618932944937>";
+    public final static String VORTEX   = "<:frye:1253366756865740810>";
+    public final static String SUCCESS  = "<:frye:1253366756865740810>";
+    public final static String WARNING  = ":warning:";
+    public final static String ERROR    = ":x:";
+    public final static String LOADING  = "<a:typing:1252198443225710704>";
     
     // bot
     public final static String BOT          = "<:bot:850113743764717627>";
diff --git a/src/main/java/com/jagrosh/vortex/Listener.java b/src/main/java/com/jagrosh/vortex/Listener.java
index 6bdbd9e..cc367e1 100644
--- a/src/main/java/com/jagrosh/vortex/Listener.java
+++ b/src/main/java/com/jagrosh/vortex/Listener.java
@@ -39,7 +39,6 @@
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageUpdateEvent;
 import net.dv8tion.jda.api.events.user.update.UserUpdateAvatarEvent;
-import net.dv8tion.jda.api.events.user.update.UserUpdateDiscriminatorEvent;
 import net.dv8tion.jda.api.events.user.update.UserUpdateNameEvent;
 import net.dv8tion.jda.api.hooks.EventListener;
 import org.slf4j.Logger;
@@ -176,13 +175,6 @@
                 unue.getUser().getMutualGuilds().stream().map(g -> g.getMember(unue.getUser())).forEach(m -> vortex.getAutoMod().dehoist(m));
             }
         }
-        else if (event instanceof UserUpdateDiscriminatorEvent)
-        {
-            // Make sure the discrim actually changed
-            UserUpdateDiscriminatorEvent udue = (UserUpdateDiscriminatorEvent) event;
-            if(!udue.getNewDiscriminator().equals(udue.getOldDiscriminator()))
-                vortex.getBasicLogger().logDiscrimChange((UserUpdateDiscriminatorEvent)event);
-        }
         else if (event instanceof GuildMemberUpdateNicknameEvent)
         {
             vortex.getAutoMod().dehoist(((GuildMemberUpdateNicknameEvent) event).getMember());
diff --git a/src/main/java/com/jagrosh/vortex/Vortex.java b/src/main/java/com/jagrosh/vortex/Vortex.java
index ff01c4d..7c6d2d2 100644
--- a/src/main/java/com/jagrosh/vortex/Vortex.java
+++ b/src/main/java/com/jagrosh/vortex/Vortex.java
@@ -97,7 +97,7 @@
         listener = new CommandExceptionListener();
         CommandClient client = new CommandClientBuilder()
                         .setPrefix(Constants.PREFIX)
-                        .setActivity(Activity.playing(Constants.Wiki.PRIMARY_LINK))
+                        .setActivity(Activity.playing("chilling in splatsville"))
                         .setOwnerId(Constants.OWNER_ID)
                         .setServerInvite(Constants.SERVER_INVITE)
                         .setEmojis(Constants.SUCCESS, Constants.WARNING, Constants.ERROR)
@@ -197,14 +197,14 @@
                 .disableCache(CacheFlag.EMOTE, CacheFlag.ACTIVITY, CacheFlag.CLIENT_STATUS, CacheFlag.ONLINE_STATUS)
                 .addEventListeners(new Listener(this), client, waiter)
                 .setStatus(OnlineStatus.DO_NOT_DISTURB)
-                .setActivity(Activity.playing("loading..."))
+                .setActivity(Activity.playing("Loading Frye..."))
                 .build();
         
         modlog.start();
         uptime.start();
         
         threadpool.scheduleWithFixedDelay(() -> cleanPremium(), 0, 2, TimeUnit.HOURS);
-        threadpool.scheduleWithFixedDelay(() -> leavePointlessGuilds(), 5, 30, TimeUnit.MINUTES);
+        //threadpool.scheduleWithFixedDelay(() -> leavePointlessGuilds(), 5, 30, TimeUnit.MINUTES);
         threadpool.scheduleWithFixedDelay(() -> database.tempbans.checkUnbans(shards), 0, 2, TimeUnit.MINUTES);
         threadpool.scheduleWithFixedDelay(() -> database.tempmutes.checkUnmutes(shards, database.settings), 0, 45, TimeUnit.SECONDS);
         threadpool.scheduleWithFixedDelay(() -> database.tempslowmodes.checkSlowmode(shards), 0, 45, TimeUnit.SECONDS);
diff --git a/src/main/java/com/jagrosh/vortex/automod/InviteResolver.java b/src/main/java/com/jagrosh/vortex/automod/InviteResolver.java
index 3b81262..755cd5a 100644
--- a/src/main/java/com/jagrosh/vortex/automod/InviteResolver.java
+++ b/src/main/java/com/jagrosh/vortex/automod/InviteResolver.java
@@ -124,7 +124,7 @@
     {
         Response res = client.newCall(new Request.Builder().get()
                 .addHeader("Authorization", token)
-                .addHeader("User-Agent", "DiscordBot (VortexInviteResolver, 1.0)")
+                .addHeader("User-Agent", "DiscordBot (FryeInviteResolverBasedOnVortex, 1.0)")
                 .url("https://" + rand(BASE_URLS) + "/api/invites/" + code)
                 .build()).execute();
         if(res.isSuccessful())
diff --git a/src/main/java/com/jagrosh/vortex/commands/general/AboutCmd.java b/src/main/java/com/jagrosh/vortex/commands/general/AboutCmd.java
index 8c5bba3..5d7c8b5 100644
--- a/src/main/java/com/jagrosh/vortex/commands/general/AboutCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/general/AboutCmd.java
@@ -47,11 +47,12 @@
     {
         ShardManager sm = event.getJDA().getShardManager();
         event.reply(new MessageBuilder()
-                .setContent(Constants.VORTEX_EMOJI + " **All about Vortex** " + Constants.VORTEX_EMOJI)
+                .setContent(Constants.VORTEX_EMOJI + " **All about Frye** " + Constants.VORTEX_EMOJI)
                 .setEmbed(new EmbedBuilder()
                         .setColor(!event.isFromType(ChannelType.TEXT) ? Color.GRAY : event.getSelfMember().getColor())
-                        .setDescription("Hello, I am **Vortex**#8540, a bot designed to keep your server safe and make moderating fast and easy!\n"
-                                + "I was written in Java by **jagrosh**#4824 using [JDA](" + JDAInfo.GITHUB + ") and [JDA-Utilities](" + JDAUtilitiesInfo.GITHUB + ")\n"
+                        .setDescription("Hello, I am **Frye**#7106, a bot designed to keep your server safe and make moderating fast and easy!\n"
+                                + "I was written in Java by **ssdrive** using [JDA](" + JDAInfo.GITHUB + ") and [JDA-Utilities](" + JDAUtilitiesInfo.GITHUB + ")\n"
+                                + "I'm based on the Vortex bot by **jagrosh**, with some modern improvements.\n"
                                 + "Type `" + event.getClient().getPrefix() + event.getClient().getHelpWord() + "` for help and information.\n\n"
                                 + FormatUtil.helpLinks(event))
                         .addField("Stats", sm.getShardsTotal()+ " Shards\n" + sm.getGuildCache().size() + " Servers", true)
diff --git a/src/main/java/com/jagrosh/vortex/commands/general/InviteCmd.java b/src/main/java/com/jagrosh/vortex/commands/general/InviteCmd.java
index 83267d0..45194af 100644
--- a/src/main/java/com/jagrosh/vortex/commands/general/InviteCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/general/InviteCmd.java
@@ -35,7 +35,7 @@
     @Override
     protected void execute(CommandEvent event) 
     {
-        event.reply("Hello. I am **"+event.getJDA().getSelfUser().getName()+"**, a simple moderation bot built by **jagrosh**#4824."
+        event.reply("Hello. I am **"+event.getJDA().getSelfUser().getName()+"**, a simple moderation bot built by **ssdrive**."
                 + "\nYou can find out how to add me to your server with the link below:"
                 + "\n\n\uD83D\uDD17 **<"+Constants.Wiki.START+">**" // 🔗
                 + "\n\nFor assistance, check out the wiki: <"+Constants.Wiki.WIKI_BASE+">");
diff --git a/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java b/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java
index 0ef3c49..d015c14 100644
--- a/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/general/ServerinfoCmd.java
@@ -26,7 +26,7 @@
  *
  * @author John Grosh (john.a.grosh@gmail.com)
  */
-public class ServerinfoCmd extends Command
+public class    ServerinfoCmd extends Command
 {
     private final static String LINESTART = "\u25AB"; // â–«
     private final static String GUILD_EMOJI = "\uD83D\uDDA5"; // 🖥
@@ -54,7 +54,7 @@
                 .replace("@here", "@h\u0435re") // cyrillic e
                 .replace("discord.gg/", "dis\u0441ord.gg/"); // cyrillic c;
         String str = LINESTART + "ID: **" + guild.getId() + "**\n"
-                + LINESTART + "Owner: " + (owner == null ? "Unknown" : "**" + owner.getUser().getName() + "**#" + owner.getUser().getDiscriminator()) + "\n";
+                + LINESTART + "Owner: " + (owner == null ? "Unknown" : "**" + owner.getUser().getName() + "**") + "\n";
         if(!guild.getVoiceChannels().isEmpty())
         {
             Region reg = guild.getVoiceChannels().get(0).getRegion();
diff --git a/src/main/java/com/jagrosh/vortex/commands/general/UserinfoCmd.java b/src/main/java/com/jagrosh/vortex/commands/general/UserinfoCmd.java
index 2beccfd..b9dd158 100644
--- a/src/main/java/com/jagrosh/vortex/commands/general/UserinfoCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/general/UserinfoCmd.java
@@ -79,7 +79,7 @@
             }
         }
         User user = member.getUser();
-        String title = (user.isBot() ? Emoji.BOT : USER_EMOJI)+" Information about **"+user.getName()+"** #"+user.getDiscriminator()+":";
+        String title = (user.isBot() ? Emoji.BOT : USER_EMOJI) + " Information about **" + user.getName() + "**:";
         StringBuilder str = new StringBuilder(LINESTART + "Discord ID: **" + user.getId() + "** ");
         user.getFlags().forEach(flag -> str.append(OtherUtil.getEmoji(flag)));
         if(user.getAvatarId() != null && user.getAvatarId().startsWith("a_"))
diff --git a/src/main/java/com/jagrosh/vortex/commands/moderation/StrikeCmd.java b/src/main/java/com/jagrosh/vortex/commands/moderation/StrikeCmd.java
index 4de0acf..27076de 100644
--- a/src/main/java/com/jagrosh/vortex/commands/moderation/StrikeCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/moderation/StrikeCmd.java
@@ -31,6 +31,7 @@
 /**
  *
  * @author John Grosh (john.a.grosh@gmail.com)
+ * @author desadametaj (desadametaj1@gmail.com)
  */
 public class StrikeCmd extends ModCommand
 {
@@ -60,18 +61,18 @@
         }
         if(numstrikes<1 || numstrikes>100)
         {
-            event.replyError("Number of strikes must be between 1 and 100!");
+            event.replyError("number of strikes must be between 1 and 100!");
             return;
         }
         ResolvedArgs args = ArgsUtil.resolve(str, event.getGuild());
         if(args.isEmpty())
         {
-            event.replyError("Please provide at least one user!");
+            event.replyError("please provide at least one user!");
             return;
         }
         if(args.reason==null || args.reason.isEmpty())
         {
-            event.replyError("Please provide a reason for the strike(s)!");
+            event.replyError("please provide a reason for the strike(s)!");
             return;
         }
         StringBuilder builder = new StringBuilder();
@@ -80,16 +81,16 @@
         args.members.forEach(m -> 
         {
             if(!event.getMember().canInteract(m))
-                builder.append("\n").append(event.getClient().getError()).append(" You do not have permission to interact with ").append(FormatUtil.formatUser(m.getUser()));
+                builder.append("\n").append(event.getClient().getError()).append(" you do not have permission to interact with ").append(FormatUtil.formatUser(m.getUser()));
             else if(!event.getSelfMember().canInteract(m))
-                builder.append("\n").append(event.getClient().getError()).append(" I am unable to interact with ").append(FormatUtil.formatUser(m.getUser()));
+                builder.append("\n").append(event.getClient().getError()).append(" i can't interact with ").append(FormatUtil.formatUser(m.getUser())).append(", try moving my role up higher than theirs");
             else if(modrole!=null && m.getRoles().contains(modrole))
-                builder.append("\n").append(event.getClient().getError()).append(" I won't strike ").append(FormatUtil.formatUser(m.getUser())).append(" because they have the Moderator Role");
+                builder.append("\n").append(event.getClient().getError()).append(" i'm not going to strike ").append(FormatUtil.formatUser(m.getUser())).append(", they have the moderator role");
             else
                 args.users.add(m.getUser());
         });
         
-        args.unresolved.forEach(un -> builder.append("\n").append(event.getClient().getWarning()).append(" Could not resolve `").append(un).append("` to a user ID"));
+        args.unresolved.forEach(un -> builder.append("\n").append(event.getClient().getWarning()).append(" err: could not resolve `").append(un).append("` to a user ID"));
         
         List<Long> unknownIds = new LinkedList<>();
         args.ids.forEach(id -> 
diff --git a/src/main/java/com/jagrosh/vortex/commands/owner/PremiumCmd.java b/src/main/java/com/jagrosh/vortex/commands/owner/PremiumCmd.java
index b0515d8..4b9df8c 100644
--- a/src/main/java/com/jagrosh/vortex/commands/owner/PremiumCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/owner/PremiumCmd.java
@@ -42,7 +42,7 @@
         this.ownerCommand = true;
         this.guildOnly = false;
         this.hidden = true;
-        this.children = new Command[]{ new PremiumAddCmd(), new PremiumInfoCmd(), new PremiumUserCmd(), new PremiumRemoveCmd() };
+        this.children = new Command[]{ new PremiumAddCmd(), new PremiumInfoCmd(), new PremiumUserCmd(), new PremiumRemoveCmd(), new PremiumAddUltraCmd(), new PremiumAddPlusCmd() };
     }
 
     @Override
@@ -154,6 +154,104 @@
             event.replySuccess("Before: " + before + "\n" + event.getClient().getSuccess() + " After: " + after);
         }
     }
+
+    private class PremiumAddUltraCmd extends Command
+    {
+        private PremiumAddUltraCmd()
+        {
+            this.name = "addultra";
+            this.help = "adds premium ultra time";
+            this.arguments = "<guildId> <time>";
+            this.ownerCommand = true;
+            this.guildOnly = false;
+            this.hidden = true;
+        }
+
+        @Override
+        protected void execute(CommandEvent event)
+        {
+            String[] parts = event.getArgs().split("\\s+", 2);
+            if(parts.length < 2)
+            {
+                event.replyError("Too few arguments");
+                return;
+            }
+            int seconds = OtherUtil.parseTime(parts[1]);
+            if(seconds <= 0)
+            {
+                event.replyError("Invalid time");
+                return;
+            }
+            Guild guild;
+            try
+            {
+                guild = vortex.getShardManager().getGuildById(Long.parseLong(parts[0]));
+            }
+            catch(NumberFormatException ex)
+            {
+                event.replyError("Invalid guild ID");
+                return;
+            }
+            if(guild == null)
+            {
+                event.replyError("No guild found with ID `" + parts[0] + "`");
+                return;
+            }
+            PremiumInfo before = vortex.getDatabase().premium.getPremiumInfo(guild);
+            vortex.getDatabase().premium.addPremium(guild, PremiumManager.Level.ULTRA, seconds, ChronoUnit.SECONDS);
+            PremiumInfo after = vortex.getDatabase().premium.getPremiumInfo(guild);
+            event.replySuccess("Before: " + before + "\n" + event.getClient().getSuccess() + " After: " + after);
+        }
+    }
+
+    private class PremiumAddPlusCmd extends Command
+    {
+        private PremiumAddPlusCmd()
+        {
+            this.name = "addplus";
+            this.help = "adds premium plus time";
+            this.arguments = "<guildId> <time>";
+            this.ownerCommand = true;
+            this.guildOnly = false;
+            this.hidden = true;
+        }
+
+        @Override
+        protected void execute(CommandEvent event)
+        {
+            String[] parts = event.getArgs().split("\\s+", 2);
+            if(parts.length < 2)
+            {
+                event.replyError("Too few arguments");
+                return;
+            }
+            int seconds = OtherUtil.parseTime(parts[1]);
+            if(seconds <= 0)
+            {
+                event.replyError("Invalid time");
+                return;
+            }
+            Guild guild;
+            try
+            {
+                guild = vortex.getShardManager().getGuildById(Long.parseLong(parts[0]));
+            }
+            catch(NumberFormatException ex)
+            {
+                event.replyError("Invalid guild ID");
+                return;
+            }
+            if(guild == null)
+            {
+                event.replyError("No guild found with ID `" + parts[0] + "`");
+                return;
+            }
+            PremiumInfo before = vortex.getDatabase().premium.getPremiumInfo(guild);
+            vortex.getDatabase().premium.addPremium(guild, PremiumManager.Level.PLUS, seconds, ChronoUnit.SECONDS);
+            PremiumInfo after = vortex.getDatabase().premium.getPremiumInfo(guild);
+            event.replySuccess("Before: " + before + "\n" + event.getClient().getSuccess() + " After: " + after);
+        }
+    }
     
     private class PremiumInfoCmd extends Command
     {
diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmd.java b/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmd.java
index cbf82dd..8f9e97c 100644
--- a/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmd.java
@@ -1,18 +1,3 @@
-/*
- * Copyright 2016 John Grosh (jagrosh).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.jagrosh.vortex.commands.settings;
 
 import java.util.concurrent.TimeUnit;
@@ -29,16 +14,15 @@
 import net.dv8tion.jda.api.entities.VoiceChannel;
 
 /**
- *
- * @author John Grosh (jagrosh)
+ * Command for setting up the bot in the server.
  */
 public class SetupCmd extends Command
 {
     private final String CANCEL = "\u274C"; // ❌
     private final String CONFIRM = "\u2611"; // ☑
-    
+
     private final Vortex vortex;
-    
+
     public SetupCmd(Vortex vortex)
     {
         this.vortex = vortex;
@@ -48,18 +32,18 @@
         this.guildOnly = true;
         this.userPermissions = new Permission[]{Permission.MANAGE_SERVER};
         this.botPermissions = new Permission[]{Permission.ADMINISTRATOR};
-        this.children = new Command[]{new MuteSetupCmd()/*, new AutomodSetupCmd()*/};
+        this.children = new Command[]{new MuteSetupCmd(), new AutomodSetupCmd(), new VerificationSetupCmd()};
     }
-    
+
     @Override
-    protected void execute(CommandEvent event) 
+    protected void execute(CommandEvent event)
     {
         StringBuilder sb = new StringBuilder("The following commands can be used to set up a **").append(event.getSelfUser().getName()).append("** feature:\n");
         for(Command cmd: children)
             sb.append("\n`").append(event.getClient().getPrefix()).append(name).append(" ").append(cmd.getName()).append("` - ").append(cmd.getHelp());
         event.replySuccess(sb.toString());
     }
-    
+
     private class AutomodSetupCmd extends Command
     {
         private AutomodSetupCmd()
@@ -78,12 +62,10 @@
         @Override
         protected void execute(CommandEvent event)
         {
-            waitForConfirmation(event, "This will enable all automod defaults. Any existing settings will not be overwritten.", () -> 
+            waitForConfirmation(event, "This will enable all automod defaults. Any existing settings will not be overwritten.", () ->
             {
                 event.getChannel().sendTyping().queue();
                 StringBuilder sb = new StringBuilder("**Automod setup complete!**");
-                //if(vortex.getDatabase().actions.useDefaultSettings(event.getGuild()))
-                //    sb.append("\n").append(event.getClient().getSuccess()).append(" Set up default punishments");
                 AutomodSettings ams = vortex.getDatabase().automod.getSettings(event.getGuild());
                 if(ams.inviteStrikes==0)
                 {
@@ -136,7 +118,7 @@
             });
         }
     }
-    
+
     private class MuteSetupCmd extends Command
     {
         private MuteSetupCmd()
@@ -151,7 +133,7 @@
             this.cooldown = 20;
             this.cooldownScope = CooldownScope.GUILD;
         }
-        
+
         @Override
         protected void execute(CommandEvent event)
         {
@@ -176,11 +158,11 @@
             waitForConfirmation(event, confirmation, () -> setUpMutedRole(event, muted));
         }
     }
-    
+
     private void setUpMutedRole(CommandEvent event, Role role)
     {
         StringBuilder sb = new StringBuilder(event.getClient().getSuccess()+" Muted role setup started!\n");
-        event.reply(sb + Constants.LOADING+" Initializing role...", m -> event.async(() -> 
+        event.reply(sb + Constants.LOADING+" Initializing role...", m -> event.async(() ->
         {
             try
             {
@@ -233,7 +215,7 @@
             }
         }));
     }
-    
+
     private void waitForConfirmation(CommandEvent event, String message, Runnable confirm)
     {
         new ButtonMenu.Builder()
@@ -249,4 +231,32 @@
                         confirm.run();
                 }).build().display(event.getChannel());
     }
-}
\ No newline at end of file
+
+    private class VerificationSetupCmd extends Command
+    {
+        private VerificationSetupCmd()
+        {
+            this.name = "verification";
+            this.category = new Category("Settings");
+            this.help = "sets up the verification system";
+            this.guildOnly = true;
+            this.userPermissions = new Permission[]{Permission.MANAGE_SERVER};
+            this.botPermissions = new Permission[]{Permission.ADMINISTRATOR};
+        }
+
+        @Override
+        protected void execute(CommandEvent event)
+        {
+            String verificationMessage = "**How to setup verification**\n"
+                                        + "Text version: Go into Roles, and create your member role if you haven't already.\n\n"
+                                        + "Then, in your Member role, click 'Links' and add Frye to it.\n\n"
+                                        + "Make sure to enable the requirement, it is required.\n\n"
+                                        + "Then, simply instruct users who join to click the server name, and click 'Linked Roles' to verify!\n\n"
+                                        + "P.S. This can also be used for any role, not just for verification.\n\n"
+                                        + "[Video](https://cdn.abmanagement.al/frye-1.mov)";
+
+            event.replySuccess(verificationMessage);
+        }
+    }
+}
+
diff --git a/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmdOLD.disabled b/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmdOLD.disabled
new file mode 100644
index 0000000..cbf82dd
--- /dev/null
+++ b/src/main/java/com/jagrosh/vortex/commands/settings/SetupCmdOLD.disabled
@@ -0,0 +1,252 @@
+/*
+ * Copyright 2016 John Grosh (jagrosh).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.jagrosh.vortex.commands.settings;
+
+import java.util.concurrent.TimeUnit;
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
+import com.jagrosh.jdautilities.menu.ButtonMenu;
+import com.jagrosh.vortex.Constants;
+import com.jagrosh.vortex.Vortex;
+import com.jagrosh.vortex.database.managers.AutomodManager.AutomodSettings;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.PermissionOverride;
+import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.VoiceChannel;
+
+/**
+ *
+ * @author John Grosh (jagrosh)
+ */
+public class SetupCmd extends Command
+{
+    private final String CANCEL = "\u274C"; // ❌
+    private final String CONFIRM = "\u2611"; // ☑
+    
+    private final Vortex vortex;
+    
+    public SetupCmd(Vortex vortex)
+    {
+        this.vortex = vortex;
+        this.name = "setup";
+        this.category = new Category("Settings");
+        this.help = "server setup";
+        this.guildOnly = true;
+        this.userPermissions = new Permission[]{Permission.MANAGE_SERVER};
+        this.botPermissions = new Permission[]{Permission.ADMINISTRATOR};
+        this.children = new Command[]{new MuteSetupCmd()/*, new AutomodSetupCmd()*/};
+    }
+    
+    @Override
+    protected void execute(CommandEvent event) 
+    {
+        StringBuilder sb = new StringBuilder("The following commands can be used to set up a **").append(event.getSelfUser().getName()).append("** feature:\n");
+        for(Command cmd: children)
+            sb.append("\n`").append(event.getClient().getPrefix()).append(name).append(" ").append(cmd.getName()).append("` - ").append(cmd.getHelp());
+        event.replySuccess(sb.toString());
+    }
+    
+    private class AutomodSetupCmd extends Command
+    {
+        private AutomodSetupCmd()
+        {
+            this.name = "automod";
+            this.aliases = new String[]{"auto"};
+            this.category = new Category("Settings");
+            this.help = "sets up the auto-moderator";
+            this.guildOnly = true;
+            this.userPermissions = new Permission[]{Permission.MANAGE_SERVER};
+            this.botPermissions = new Permission[]{Permission.ADMINISTRATOR};
+            this.cooldown = 20;
+            this.cooldownScope = CooldownScope.GUILD;
+        }
+
+        @Override
+        protected void execute(CommandEvent event)
+        {
+            waitForConfirmation(event, "This will enable all automod defaults. Any existing settings will not be overwritten.", () -> 
+            {
+                event.getChannel().sendTyping().queue();
+                StringBuilder sb = new StringBuilder("**Automod setup complete!**");
+                //if(vortex.getDatabase().actions.useDefaultSettings(event.getGuild()))
+                //    sb.append("\n").append(event.getClient().getSuccess()).append(" Set up default punishments");
+                AutomodSettings ams = vortex.getDatabase().automod.getSettings(event.getGuild());
+                if(ams.inviteStrikes==0)
+                {
+                    vortex.getDatabase().automod.setInviteStrikes(event.getGuild(), 2);
+                    sb.append("\n").append(event.getClient().getSuccess()).append(" Anti-invite set to `2` strikes");
+                }
+                if(ams.refStrikes==0)
+                {
+                    vortex.getDatabase().automod.setRefStrikes(event.getGuild(), 3);
+                    sb.append("\n").append(event.getClient().getSuccess()).append(" Anti-referral set to `3` strikes");
+                }
+                if(!ams.useAntiDuplicate())
+                {
+                    vortex.getDatabase().automod.setDupeSettings(event.getGuild(), 1, 2, 4);
+                    sb.append("\n").append(event.getClient().getSuccess()).append(" Anti-duplicate will start deleting at duplicate `2`, and will assign `1` strike each duplicate starting at duplicate `4`");
+                }
+                if(ams.copypastaStrikes==0)
+                {
+                    vortex.getDatabase().automod.setCopypastaStrikes(event.getGuild(), 1);
+                    sb.append("\n").append(event.getClient().getSuccess()).append(" Anti-copypasta set to `1` strikes");
+                }
+                if(ams.maxMentions==0)
+                {
+                    vortex.getDatabase().automod.setMaxMentions(event.getGuild(), 10);
+                    sb.append("\n").append(event.getClient().getSuccess()).append(" Maximum mentions set to `10` mentions");
+                }
+                if(ams.maxRoleMentions==0)
+                {
+                    vortex.getDatabase().automod.setMaxRoleMentions(event.getGuild(), 4);
+                    sb.append("\n").append(event.getClient().getSuccess()).append(" Maximum role mentions set to `4` mentions");
+                }
+                if(ams.maxLines==0)
+                {
+                    vortex.getDatabase().automod.setMaxLines(event.getGuild(), 10);
+                    sb.append("\n").append(event.getClient().getSuccess()).append(" Maximum lines set to `10` lines");
+                }
+                if(!ams.useAutoRaidMode())
+                {
+                    vortex.getDatabase().automod.setAutoRaidMode(event.getGuild(), 10, 10);
+                    sb.append("\n").append(event.getClient().getSuccess()).append(" Anti-Raid Mode will activate upon `10` joins in `10` seconds");
+                }
+                if(ams.dehoistChar==(char)0)
+                {
+                    vortex.getDatabase().automod.setDehoistChar(event.getGuild(), '!');
+                    sb.append("\n").append(event.getClient().getSuccess()).append(" Names starting with `!` will be dehoisted");
+                }
+                sb.append("\n").append(event.getClient().getWarning()).append(" Any settings not shown here were not set due to being already set. Please check the automod section of the wiki (<")
+                        .append(Constants.Wiki.AUTOMOD).append(">) for more information about the automod.");
+                event.replySuccess(sb.toString());
+            });
+        }
+    }
+    
+    private class MuteSetupCmd extends Command
+    {
+        private MuteSetupCmd()
+        {
+            this.name = "muterole";
+            this.aliases = new String[]{"muted","mute","mutedrole"};
+            this.category = new Category("Settings");
+            this.help = "sets up the 'Muted' role";
+            this.guildOnly = true;
+            this.userPermissions = new Permission[]{Permission.MANAGE_SERVER};
+            this.botPermissions = new Permission[]{Permission.ADMINISTRATOR};
+            this.cooldown = 20;
+            this.cooldownScope = CooldownScope.GUILD;
+        }
+        
+        @Override
+        protected void execute(CommandEvent event)
+        {
+            Role muted = vortex.getDatabase().settings.getSettings(event.getGuild()).getMutedRole(event.getGuild());
+            String confirmation;
+            if(muted!=null)
+            {
+                if(!event.getSelfMember().canInteract(muted))
+                {
+                    event.replyError("I cannot interact with the existing '"+muted.getName()+"' role. Please move my role(s) higher and then try again.");
+                    return;
+                }
+                if(!event.getMember().canInteract(muted))
+                {
+                    event.replyError("You do not have permission to interact with the existing '"+muted.getName()+"' role.");
+                    return;
+                }
+                confirmation = "This will modify the existing '"+muted.getName()+"' role and assign it overrides in every channel.";
+            }
+            else
+                confirmation = "This will create a role called 'Muted' and assign it overrides in every channel.";
+            waitForConfirmation(event, confirmation, () -> setUpMutedRole(event, muted));
+        }
+    }
+    
+    private void setUpMutedRole(CommandEvent event, Role role)
+    {
+        StringBuilder sb = new StringBuilder(event.getClient().getSuccess()+" Muted role setup started!\n");
+        event.reply(sb + Constants.LOADING+" Initializing role...", m -> event.async(() -> 
+        {
+            try
+            {
+                Role mutedRole;
+                if(role==null)
+                {
+                    mutedRole = event.getGuild().createRole().setName("Muted").setPermissions().setColor(1).complete();
+                }
+                else
+                {
+                    role.getManager().setPermissions().complete();
+                    mutedRole = role;
+                }
+                sb.append(event.getClient().getSuccess()).append(" Role initialized!\n");
+                m.editMessage(sb + Constants.LOADING+" Making Category overrides...").complete();
+                PermissionOverride po;
+                for(net.dv8tion.jda.api.entities.Category cat: event.getGuild().getCategories())
+                {
+                    po = cat.getPermissionOverride(mutedRole);
+                    if(po==null)
+                        cat.createPermissionOverride(mutedRole).setDeny(Permission.MESSAGE_WRITE, Permission.MESSAGE_ADD_REACTION, Permission.VOICE_CONNECT, Permission.VOICE_SPEAK, Permission.USE_PUBLIC_THREADS, Permission.USE_PRIVATE_THREADS).complete();
+                    else
+                        po.getManager().deny(Permission.MESSAGE_WRITE, Permission.MESSAGE_ADD_REACTION, Permission.VOICE_CONNECT, Permission.VOICE_SPEAK, Permission.USE_PUBLIC_THREADS, Permission.USE_PRIVATE_THREADS).complete();
+                }
+                sb.append(event.getClient().getSuccess()).append(" Category overrides complete!\n");
+                m.editMessage(sb + Constants.LOADING + " Making Text Channel overrides...").complete();
+                for(TextChannel tc: event.getGuild().getTextChannels())
+                {
+                    po = tc.getPermissionOverride(mutedRole);
+                    if(po==null)
+                        tc.createPermissionOverride(mutedRole).setDeny(Permission.MESSAGE_WRITE, Permission.MESSAGE_ADD_REACTION, Permission.USE_PUBLIC_THREADS, Permission.USE_PRIVATE_THREADS).complete();
+                    else
+                        po.getManager().deny(Permission.MESSAGE_WRITE, Permission.MESSAGE_ADD_REACTION, Permission.USE_PUBLIC_THREADS, Permission.USE_PRIVATE_THREADS).complete();
+                }
+                sb.append(event.getClient().getSuccess()).append(" Text Channel overrides complete!\n");
+                m.editMessage(sb + Constants.LOADING + " Making Voice Channel overrides...").complete();
+                for(VoiceChannel vc: event.getGuild().getVoiceChannels())
+                {
+                    po = vc.getPermissionOverride(mutedRole);
+                    if(po==null)
+                        vc.createPermissionOverride(mutedRole).setDeny(Permission.VOICE_CONNECT, Permission.VOICE_SPEAK).complete();
+                    else
+                        po.getManager().deny(Permission.VOICE_CONNECT, Permission.VOICE_SPEAK).complete();
+                }
+                m.editMessage(sb + event.getClient().getSuccess()+" Voice Channel overrides complete!\n\n" + event.getClient().getSuccess()+" Muted role setup has completed!").queue();
+            }
+            catch(Exception ex)
+            {
+                m.editMessage(sb + event.getClient().getError()+" An error occurred setting up the Muted role. Please check that I have the Administrator permission and that the Muted role is below my roles.").queue();
+            }
+        }));
+    }
+    
+    private void waitForConfirmation(CommandEvent event, String message, Runnable confirm)
+    {
+        new ButtonMenu.Builder()
+                .setChoices(CONFIRM, CANCEL)
+                .setEventWaiter(vortex.getEventWaiter())
+                .setTimeout(1, TimeUnit.MINUTES)
+                .setText(event.getClient().getWarning()+" "+message+"\n\n"+CONFIRM+" Continue\n"+CANCEL+" Cancel")
+                .setFinalAction(m -> m.delete().queue(s->{}, f->{}))
+                .setUsers(event.getAuthor())
+                .setAction(re ->
+                {
+                    if(re.getName().equals(CONFIRM))
+                        confirm.run();
+                }).build().display(event.getChannel());
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/jagrosh/vortex/commands/tools/AnnounceCmd.java b/src/main/java/com/jagrosh/vortex/commands/tools/AnnounceCmd.java
index ecf9ac9..57c3308 100644
--- a/src/main/java/com/jagrosh/vortex/commands/tools/AnnounceCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/tools/AnnounceCmd.java
@@ -90,7 +90,7 @@
         String fmessage = message;
         if(!role.isMentionable())
         {
-            String reason = "Announcement by "+event.getAuthor().getName()+"#"+event.getAuthor().getDiscriminator();
+            String reason = "Announcement by "+event.getAuthor().getName();
             role.getManager().setMentionable(true).reason(reason).queue(s -> 
             {
                 tc.sendMessage(fmessage).allowedMentions(EnumSet.of(Message.MentionType.ROLE)).queue(m -> 
diff --git a/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java b/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java
index 1cb538e..da25272 100644
--- a/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java
@@ -125,7 +125,7 @@
         catch(Exception ignore) {}
         if(u == null)
             return false;
-        String text = (u.isBot() ? Emoji.BOT : USER_EMOJI) + " Information about **" + u.getName() + "**#" + u.getDiscriminator() + ":";
+        String text = (u.isBot() ? Emoji.BOT : USER_EMOJI) + " Information about **" + u.getName() + "**:";
         EmbedBuilder eb = new EmbedBuilder();
         eb.setThumbnail(u.getEffectiveAvatarUrl());
         StringBuilder str = new StringBuilder(LINESTART + "Discord ID: **" + u.getId() + "** ");
diff --git a/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java b/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java
index 3a31ec1..199f258 100644
--- a/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java
+++ b/src/main/java/com/jagrosh/vortex/database/managers/PremiumManager.java
@@ -232,9 +232,9 @@
     public static enum Level
     {
         NONE("No Premium"),
-        PLUS("Vortex Pro Lite"),
-        PRO("Vortex Pro"),
-        ULTRA("Vortex Experimental");
+        PLUS("Frye Pro Lite"),
+        PRO("Frye Pro"),
+        ULTRA("Frye Experimental");
         
         public final String name;
         
diff --git a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java
index c7aa917..ab1df6e 100644
--- a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java
+++ b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java
@@ -217,25 +217,11 @@
             .filter(tc -> tc!=null).distinct()
             .forEachOrdered(tc ->
             {
-                log(now, tc, NAME, "**"+event.getOldName()+"**#"+event.getUser().getDiscriminator()+" (ID:"
+                log(now, tc, NAME, "**"+event.getOldName()+"**"+" (ID:"
                         +event.getUser().getId()+") has changed names to "+FormatUtil.formatUser(event.getUser()), null);
             });
     }
     
-    public void logDiscrimChange(UserUpdateDiscriminatorEvent event)
-    {
-        OffsetDateTime now = OffsetDateTime.now();
-        event.getJDA().getMutualGuilds(event.getEntity()).stream()
-            .filter(guild -> vortex.getShardManager().isHighestAccount(guild))
-            .map(guild -> vortex.getDatabase().settings.getSettings(guild).getServerLogChannel(guild))
-            .filter(tc -> tc!=null).distinct()
-            .forEachOrdered(tc ->
-            {
-                log(now, tc, NAME, "**"+event.getUser().getName()+"**#"+event.getOldDiscriminator()+" (ID:"
-                        +event.getUser().getId()+") has changed discrims to "+FormatUtil.formatUser(event.getUser()), null);
-            });
-    }
-    
     public void logGuildJoin(GuildMemberJoinEvent event)
     {
         TextChannel tc = vortex.getDatabase().settings.getSettings(event.getGuild()).getServerLogChannel(event.getGuild());
diff --git a/src/main/java/com/jagrosh/vortex/logging/MessageCache.java b/src/main/java/com/jagrosh/vortex/logging/MessageCache.java
index 6c0e1f6..135c239 100644
--- a/src/main/java/com/jagrosh/vortex/logging/MessageCache.java
+++ b/src/main/java/com/jagrosh/vortex/logging/MessageCache.java
@@ -58,7 +58,7 @@
     
     public class CachedMessage implements ISnowflake
     {
-        private final String content, username, discriminator;
+        private final String content, username;
         private final long id, author, channel, guild;
         private final List<Attachment> attachments;
         
@@ -68,7 +68,6 @@
             id = message.getIdLong();
             author = message.getAuthor().getIdLong();
             username = message.getAuthor().getName();
-            discriminator = message.getAuthor().getDiscriminator();
             channel = message.getChannel().getIdLong();
             guild = message.isFromGuild() ? message.getGuild().getIdLong() : 0L;
             attachments = message.getAttachments();
@@ -99,11 +98,6 @@
             return username;
         }
         
-        public String getDiscriminator()
-        {
-            return discriminator;
-        }
-        
         public long getAuthorId()
         {
             return author;
diff --git a/src/main/java/com/jagrosh/vortex/managers/UptimeManager.java b/src/main/java/com/jagrosh/vortex/managers/UptimeManager.java
index e1ca8e9..c111222 100644
--- a/src/main/java/com/jagrosh/vortex/managers/UptimeManager.java
+++ b/src/main/java/com/jagrosh/vortex/managers/UptimeManager.java
@@ -58,7 +58,7 @@
         {
             boolean closed = database.getConnection().isClosed();
             int prem = database.premium.getPremiumGuilds().size();
-            valid = !closed && prem >= minPrem;
+            valid = !closed;
         }
         catch(Exception ignored){}
         
@@ -79,6 +79,5 @@
             Thread.sleep(1000);
         }
         catch(Exception ignored){}
-        System.exit(1);
     }
 }
diff --git a/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java b/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java
index 970898d..98a8436 100644
--- a/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java
+++ b/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java
@@ -71,7 +71,7 @@
     
     public static String formatCachedMessageFullUser(CachedMessage msg)
     {
-        return filterEveryone("**"+msg.getUsername()+"**#"+msg.getDiscriminator()+" (ID:"+msg.getAuthorId()+")");
+        return filterEveryone("**"+msg.getUsername()+"**"+" (ID:"+msg.getAuthorId()+")");
     }
     
     public static String formatUser(User user)
@@ -147,7 +147,7 @@
     {
         String out = String.format(MULTIPLE_FOUND, "users", query);
         for(int i=0; i<6 && i<list.size(); i++)
-            out+="\n - **"+list.get(i).getName()+"**#"+list.get(i).getDiscriminator()+" (ID:"+list.get(i).getId()+")";
+            out+="\n - **"+list.get(i).getName()+"**"+" (ID:"+list.get(i).getId()+")";
         if(list.size()>6)
             out+="\n**And "+(list.size()-6)+" more...**";
         return out;
@@ -157,7 +157,7 @@
     {
         String out = String.format(MULTIPLE_FOUND, "members", query);
         for(int i=0; i<6 && i<list.size(); i++)
-            out+="\n - **"+list.get(i).getUser().getName()+"**#"+list.get(i).getUser().getDiscriminator()+" (ID:"+list.get(i).getUser().getId()+")";
+            out+="\n - **"+list.get(i).getUser().getName()+"**"+" (ID:"+list.get(i).getUser().getId()+")";
         if(list.size()>6)
             out+="\n**And "+(list.size()-6)+" more...**";
         return out;
@@ -300,8 +300,8 @@
     public static String helpLinks(CommandEvent event)
     {
         return "\uD83D\uDD17 ["+event.getSelfUser().getName()+" Wiki]("+Constants.Wiki.WIKI_BASE+")\n" // 🔗
-                + "<:discord:314003252830011395> [Support Server]("+event.getClient().getServerInvite()+")\n"
+                + "<:dickcord:1253389864817397901> [Support Server]("+event.getClient().getServerInvite()+")\n"
                 +  CMD_EMOJI + " [Full Command Reference]("+Constants.Wiki.COMMANDS+")\n"
-                + "<:patreon:417455429145329665> [Donations]("+Constants.DONATION_LINK+")";
+                + "<:dickreon:1253389956857069711> [Donations]("+Constants.DONATION_LINK+")";
     }
 }
diff --git a/src/main/java/com/jagrosh/vortex/utils/LogUtil.java b/src/main/java/com/jagrosh/vortex/utils/LogUtil.java
index aaa332f..2e96bb3 100644
--- a/src/main/java/com/jagrosh/vortex/utils/LogUtil.java
+++ b/src/main/java/com/jagrosh/vortex/utils/LogUtil.java
@@ -45,8 +45,8 @@
     private final static String MODLOG_CASE = " `[%d]`";
     private final static String EMOJI = " %s";
     private final static String ACTION = " %s";
-    private final static String MODERATOR = " **%s**#%s";
-    private final static String TARGET_USER = " **%s**#%s (ID:%s)";
+    private final static String MODERATOR = " **%s**";
+    private final static String TARGET_USER = " **%s** (ID:%s)";
     private final static String REASON = "\n`[ Reason ]` %s";
     
     private final static String MODLOG_USER_FORMAT   = LOG_TIME + MODLOG_CASE + EMOJI + MODERATOR + ACTION + TARGET_USER + REASON;
@@ -61,8 +61,8 @@
     // Modlog methods
     public static String modlogUserFormat(OffsetDateTime time, ZoneId zone, int caseNum, User moderator, Action action, User target, String reason)
     {
-        return String.format(MODLOG_USER_FORMAT, timeF(time, zone), caseNum, action.getEmoji(), moderator.getName(), 
-                moderator.getDiscriminator(), action.getVerb(), target.getName(), target.getDiscriminator(), target.getId(), 
+        return String.format(MODLOG_USER_FORMAT, timeF(time, zone), caseNum, action.getEmoji(), moderator.getName(),
+                action.getVerb(), target.getName(), target.getId(),
                 reasonF(reason));
     }
     
@@ -75,15 +75,14 @@
     
     public static String modlogCleanFormat(OffsetDateTime time, ZoneId zone, int caseNum, User moderator, int numMessages, TextChannel channel, String criteria, String reason)
     {
-        return String.format(MODLOG_CLEAN_FORMAT, timeF(time, zone), caseNum, Action.CLEAN.getEmoji(), moderator.getName(), 
-                moderator.getDiscriminator(), Action.CLEAN.getVerb(), numMessages, channel.getAsMention(), criteria, reasonF(reason));
+        return String.format(MODLOG_CLEAN_FORMAT, timeF(time, zone), caseNum, Action.CLEAN.getEmoji(), moderator.getName(),
+                Action.CLEAN.getVerb(), numMessages, channel.getAsMention(), criteria, reasonF(reason));
     }
     
     public static String modlogStrikeFormat(OffsetDateTime time, ZoneId zone, int caseNum, User moderator, int givenStrikes, int oldStrikes, int newStrikes, User target, String reason)
     {
         return String.format(MODLOG_STRIKE_FORMAT, timeF(time, zone), caseNum, Action.STRIKE.getEmoji(), moderator.getName(),
-                moderator.getDiscriminator(), givenStrikes, oldStrikes, newStrikes, target.getName(), target.getDiscriminator(), target.getId(), 
-                reasonF(reason));
+                givenStrikes, oldStrikes, newStrikes, target.getName(), target.getId(), reasonF(reason));
     }
     
     public static String modlogPardonFormat(OffsetDateTime time, ZoneId zone, int caseNum, User moderator, int pardonedStrikes, int oldStrikes, int newStrikes, User target, String reason)
@@ -161,7 +160,7 @@
     {
         sb.append("\r\n\r\n[")
             .append(m.getTimeCreated().format(DateTimeFormatter.RFC_1123_DATE_TIME))
-            .append("] ").append(m.getAuthor().getName()).append("#").append(m.getAuthor().getDiscriminator())
+                .append("] ").append(m.getAuthor().getName())
             .append(" (").append(m.getAuthor().getId()).append(") : ").append(m.getContentRaw());
         m.getAttachments().forEach(att -> sb.append("\n").append(att.getUrl()));
     }
@@ -172,9 +171,9 @@
             .append(m.getTimeCreated().format(DateTimeFormatter.RFC_1123_DATE_TIME))
             .append("] ");
         if(author==null)
-            sb.append(m.getUsername()).append("#").append(m.getDiscriminator()).append(" (").append(m.getAuthorId());
+            sb.append(m.getUsername()).append(" (").append(m.getAuthorId());
         else
-            sb.append(author.getName()).append("#").append(author.getDiscriminator()).append(" (").append(author.getId());
+            sb.append(author.getName()).append(" (").append(author.getId());
         sb.append(") : ").append(m.getContentRaw());
         m.getAttachments().forEach(att -> sb.append("\n").append(att.getUrl()));
     }
@@ -197,14 +196,14 @@
     
     public static String auditReasonFormat(Member moderator, String reason)
     {
-        return limit512(String.format(AUDIT_BASIC_FORMAT, moderator.getUser().getName(), moderator.getUser().getDiscriminator(), reasonF(reason)));
+        return limit512(String.format(AUDIT_BASIC_FORMAT, moderator.getUser().getName(), reasonF(reason)));
     }
     
     public static String auditReasonFormat(Member moderator, int minutes, String reason)
     {
         if(minutes<=0)
             return auditReasonFormat(moderator, reason);
-        return limit512(String.format(AUDIT_TIMED_FORMAT, moderator.getUser().getName(), moderator.getUser().getDiscriminator(), minutes, reasonF(reason)));
+        return limit512(String.format(AUDIT_TIMED_FORMAT, moderator.getUser().getName(), minutes, reasonF(reason)));
     }
     
     public static ParsedAuditReason parse(Guild guild, String reason)
diff --git a/src/test/java/com/jagrosh/vortex/InviteTest.java b/src/test/java/com/jagrosh/vortex/InviteTest.java
deleted file mode 100644
index 05c092c..0000000
--- a/src/test/java/com/jagrosh/vortex/InviteTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2021 John Grosh (john.a.grosh@gmail.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.jagrosh.vortex;
-
-import com.jagrosh.vortex.automod.InviteResolver;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-/**
- *
- * @author John Grosh (john.a.grosh@gmail.com)
- */
-public class InviteTest
-{
-    @Test
-    public void inviteTest() 
-    {
-        InviteResolver ir = new InviteResolver();
-        
-        long validId = ir.resolve("0p9LSGoRLu6Pet0k", "");
-        assertEquals(validId, 147698382092238848L);
-        
-        long invalidId = ir.resolve("discord-not-a-real-code", "");
-        assertEquals(invalidId, 0L);
-    }
-}