diff --git a/.gitignore b/.gitignore
index e3ea30256..7802cb73e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@
 .vscode
 # BlueJ files
 *.ctxt
-.bin
+bin
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
diff --git a/src/main/java/keystrokesmod/module/impl/other/ClientSpoofer.java b/src/main/java/keystrokesmod/module/impl/other/ClientSpoofer.java
index f5e66d522..220b643ef 100644
--- a/src/main/java/keystrokesmod/module/impl/other/ClientSpoofer.java
+++ b/src/main/java/keystrokesmod/module/impl/other/ClientSpoofer.java
@@ -3,19 +3,15 @@
 import io.netty.buffer.Unpooled;
 import keystrokesmod.Raven;
 import keystrokesmod.event.SendPacketEvent;
-import keystrokesmod.mixins.impl.network.C17PacketCustomPayloadAccessor;
 import keystrokesmod.module.Module;
 import keystrokesmod.module.setting.impl.ButtonSetting;
 import keystrokesmod.module.setting.impl.ModeSetting;
 import net.minecraft.network.PacketBuffer;
-import net.minecraft.network.play.client.C17PacketCustomPayload;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.network.internal.FMLProxyPacket;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Objects;
-
 
 public class ClientSpoofer extends Module {
     private final ModeSetting mode = new ModeSetting("Mode", SpoofMode.getNames(), 0);
@@ -26,7 +22,9 @@ public ClientSpoofer() {
         super("ClientSpoofer", category.other);
         this.registerSetting(mode, cancelForgePacket);
     }
-
+    public void onDisable() {
+        currentSpoof = SpoofMode.FORGE;
+    }
     @Override
     public void onUpdate() {
         currentSpoof = SpoofMode.values()[(int) mode.getInput()];
@@ -34,7 +32,6 @@ public void onUpdate() {
             cancelForgePacket.disable();
         } else {
             Raven.getModuleManager().getModule("ModSpoofer").enable();
-            cancelForgePacket.disable();
         }
     }
 
@@ -62,7 +59,7 @@ public BrandInfo(String brand, String channel) {
     }
 
     enum SpoofMode {
-        FORGE("Forge", "FML", "MC|Brand"),
+        FORGE("Forge", "FML,Forge", "MC|Brand"),
         VANILLA("Vanilla", "vanilla", "MC|Brand"),
         LUNAR("Lunar", "lunarclient:v2.16.0-2426", "MC|Brand"),
         CHEATBREAKER("Cheatbreaker", "CB", "MC|Brand"),
@@ -83,10 +80,4 @@ enum SpoofMode {
             return java.util.Arrays.stream(values()).map(spoofMode -> spoofMode.name).toArray(String[]::new);
         }
     }
-
-    @Contract("_ -> new")
-    @SuppressWarnings("All")
-    private @NotNull PacketBuffer createPacketBuffer(final @NotNull String data) {
-        return new PacketBuffer(Unpooled.buffer()).writeString(data);
-    }
 }
\ No newline at end of file