diff --git a/src/main/java/dev/resent/module/base/ModManager.java b/src/main/java/dev/resent/module/base/ModManager.java
index 0daf3cc7..77ce9057 100644
--- a/src/main/java/dev/resent/module/base/ModManager.java
+++ b/src/main/java/dev/resent/module/base/ModManager.java
@@ -19,9 +19,8 @@ import dev.resent.module.impl.hud.KeyStrokes;
 import dev.resent.module.impl.hud.PotCounter;
 import dev.resent.module.impl.hud.PotionHUD;
 import dev.resent.module.impl.hud.ReachDisplay;
-import dev.resent.module.impl.misc.AdminSpawner;
 import dev.resent.module.impl.misc.AdminRay;
-import dev.resent.module.impl.misc.Animations;
+import dev.resent.module.impl.misc.AdminSpawner;
 import dev.resent.module.impl.misc.AutoGG;
 import dev.resent.module.impl.misc.AutoRespawn;
 import dev.resent.module.impl.misc.Cape;
@@ -29,17 +28,17 @@ import dev.resent.module.impl.misc.ClearChat;
 import dev.resent.module.impl.misc.Cosmetics;
 import dev.resent.module.impl.misc.CrystalOptimizer;
 import dev.resent.module.impl.misc.DynamicFOV;
-import dev.resent.module.impl.misc.FPSB;
 import dev.resent.module.impl.misc.FPSOptions;
 import dev.resent.module.impl.misc.Fullbright;
 import dev.resent.module.impl.misc.HUD;
-import dev.resent.module.impl.misc.MinimalViewBobbing;
-import dev.resent.module.impl.misc.NoParticles;
-import dev.resent.module.impl.misc.NoRain;
-import dev.resent.module.impl.misc.NoSwingDelay;
 import dev.resent.module.impl.misc.Scoreboard;
-import dev.resent.module.impl.misc.SelfNametag;
 import dev.resent.module.impl.misc.Sprint;
+import dev.resent.module.impl.setting.Animations;
+import dev.resent.module.impl.setting.MinimalViewBobbing;
+import dev.resent.module.impl.setting.NoParticles;
+import dev.resent.module.impl.setting.NoRain;
+import dev.resent.module.impl.setting.NoSwingDelay;
+import dev.resent.module.impl.setting.SelfNametag;
 
 public class ModManager {
 
@@ -65,7 +64,6 @@ public class ModManager {
     public static NoParticles noParticles = new NoParticles();
     public static Scoreboard scoreboard = new Scoreboard();
     public static ClearChat clearChat = new ClearChat();
-    public static FPSB fpsb = new FPSB();
     public static Animations animations = new Animations();
     public static MinimalViewBobbing minimalViewBobbing = new MinimalViewBobbing();
     public static NoSwingDelay noSwingDelay;
@@ -95,7 +93,6 @@ public class ModManager {
         register(crystalOptimizer);
         register(hud = new HUD());
         register(freelook = new Freelook());
-        register(fpsb);
         register(keyStrokes = new KeyStrokes());
         register(armorHud = new ArmorHud());
         register(cps = new CPS());
diff --git a/src/main/java/dev/resent/module/impl/misc/AdminSpawner.java b/src/main/java/dev/resent/module/impl/misc/AdminSpawner.java
index e59877c6..6bb0199d 100644
--- a/src/main/java/dev/resent/module/impl/misc/AdminSpawner.java
+++ b/src/main/java/dev/resent/module/impl/misc/AdminSpawner.java
@@ -10,7 +10,7 @@ import net.minecraft.client.renderer.RenderGlobal;
 import net.minecraft.tileentity.TileEntityMobSpawner;
 import net.minecraft.util.AxisAlignedBB;
 
-@Module(name = "Spawner Find", category = Category.HUD)
+@Module(name = "Spawn", category = Category.HUD)
 
 public class AdminSpawner extends Mod {
 
diff --git a/src/main/java/dev/resent/module/impl/misc/FPSB.java b/src/main/java/dev/resent/module/impl/misc/FPSB.java
deleted file mode 100644
index 13b85c10..00000000
--- a/src/main/java/dev/resent/module/impl/misc/FPSB.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package dev.resent.module.impl.misc;
-
-import dev.resent.annotation.Module;
-import dev.resent.module.base.Mod;
-import dev.resent.module.base.Mod.Category;
-import net.minecraft.util.MathHelper;
-
-@Module(name = "Fast math", category = Category.MISC)
-public class FPSB extends Mod {
-
-    public void onEnable() {
-        MathHelper.fastMath = true;
-    }
-
-    public void onDisable() {
-        MathHelper.fastMath = false;
-    }
-}
diff --git a/src/main/java/dev/resent/module/impl/misc/FPSOptions.java b/src/main/java/dev/resent/module/impl/misc/FPSOptions.java
index 9cd11095..61404156 100644
--- a/src/main/java/dev/resent/module/impl/misc/FPSOptions.java
+++ b/src/main/java/dev/resent/module/impl/misc/FPSOptions.java
@@ -48,7 +48,6 @@ public class FPSOptions extends Mod{
             gameSettings.field_181151_V = false;
 
             ModManager.noParticles.setEnabled(true);
-            ModManager.fpsb.setEnabled(true);
         }
     };
     //public BooleanSetting delay = new BooleanSetting("Chunk delay", "", false);
diff --git a/src/main/java/dev/resent/module/impl/misc/Fullbright.java b/src/main/java/dev/resent/module/impl/misc/Fullbright.java
index 8950fc26..9ebba466 100644
--- a/src/main/java/dev/resent/module/impl/misc/Fullbright.java
+++ b/src/main/java/dev/resent/module/impl/misc/Fullbright.java
@@ -7,13 +7,9 @@ import dev.resent.module.base.Mod.Category;
 @Module(name = "FullBright", category = Category.MISC)
 public class Fullbright extends Mod {
 
-    public float previousGamma;
-
     @Override
     public void onEnable() {
         if (mc.thePlayer != null && mc.theWorld != null && mc.gameSettings != null) {
-            //Resent.INSTANCE.soundManager.playAva();
-            previousGamma = mc.gameSettings.gammaSetting;
             mc.gameSettings.gammaSetting = 100;
         }
     }
@@ -21,8 +17,7 @@ public class Fullbright extends Mod {
     @Override
     public void onDisable() {
         if (mc.thePlayer != null && mc.theWorld != null && mc.gameSettings != null) {
-            //Resent.INSTANCE.soundManager.stopMusic();
-            mc.gameSettings.gammaSetting = previousGamma;
+            mc.gameSettings.gammaSetting = 1;
         }
     }
 }
diff --git a/src/main/java/dev/resent/module/impl/misc/Animations.java b/src/main/java/dev/resent/module/impl/setting/Animations.java
similarity index 84%
rename from src/main/java/dev/resent/module/impl/misc/Animations.java
rename to src/main/java/dev/resent/module/impl/setting/Animations.java
index d80ea3f0..b5adfa2b 100644
--- a/src/main/java/dev/resent/module/impl/misc/Animations.java
+++ b/src/main/java/dev/resent/module/impl/setting/Animations.java
@@ -1,4 +1,4 @@
-package dev.resent.module.impl.misc;
+package dev.resent.module.impl.setting;
 
 import dev.resent.annotation.Module;
 import dev.resent.module.base.Mod;
diff --git a/src/main/java/dev/resent/module/impl/misc/MinimalViewBobbing.java b/src/main/java/dev/resent/module/impl/setting/MinimalViewBobbing.java
similarity index 84%
rename from src/main/java/dev/resent/module/impl/misc/MinimalViewBobbing.java
rename to src/main/java/dev/resent/module/impl/setting/MinimalViewBobbing.java
index a130dbf8..0b795a87 100644
--- a/src/main/java/dev/resent/module/impl/misc/MinimalViewBobbing.java
+++ b/src/main/java/dev/resent/module/impl/setting/MinimalViewBobbing.java
@@ -1,4 +1,4 @@
-package dev.resent.module.impl.misc;
+package dev.resent.module.impl.setting;
 
 import dev.resent.annotation.Module;
 import dev.resent.module.base.Mod;
diff --git a/src/main/java/dev/resent/module/impl/misc/NoParticles.java b/src/main/java/dev/resent/module/impl/setting/NoParticles.java
similarity index 84%
rename from src/main/java/dev/resent/module/impl/misc/NoParticles.java
rename to src/main/java/dev/resent/module/impl/setting/NoParticles.java
index 991fe0bf..d5ba2aba 100644
--- a/src/main/java/dev/resent/module/impl/misc/NoParticles.java
+++ b/src/main/java/dev/resent/module/impl/setting/NoParticles.java
@@ -1,4 +1,4 @@
-package dev.resent.module.impl.misc;
+package dev.resent.module.impl.setting;
 
 import dev.resent.annotation.Module;
 import dev.resent.module.base.Mod;
diff --git a/src/main/java/dev/resent/module/impl/misc/NoRain.java b/src/main/java/dev/resent/module/impl/setting/NoRain.java
similarity index 83%
rename from src/main/java/dev/resent/module/impl/misc/NoRain.java
rename to src/main/java/dev/resent/module/impl/setting/NoRain.java
index 94cef73c..57854a82 100644
--- a/src/main/java/dev/resent/module/impl/misc/NoRain.java
+++ b/src/main/java/dev/resent/module/impl/setting/NoRain.java
@@ -1,4 +1,4 @@
-package dev.resent.module.impl.misc;
+package dev.resent.module.impl.setting;
 
 import dev.resent.annotation.Module;
 import dev.resent.module.base.Mod;
diff --git a/src/main/java/dev/resent/module/impl/misc/NoSwingDelay.java b/src/main/java/dev/resent/module/impl/setting/NoSwingDelay.java
similarity index 84%
rename from src/main/java/dev/resent/module/impl/misc/NoSwingDelay.java
rename to src/main/java/dev/resent/module/impl/setting/NoSwingDelay.java
index d309fb07..56cbf652 100644
--- a/src/main/java/dev/resent/module/impl/misc/NoSwingDelay.java
+++ b/src/main/java/dev/resent/module/impl/setting/NoSwingDelay.java
@@ -1,4 +1,4 @@
-package dev.resent.module.impl.misc;
+package dev.resent.module.impl.setting;
 
 import dev.resent.annotation.Module;
 import dev.resent.module.base.Mod;
diff --git a/src/main/java/dev/resent/module/impl/misc/SelfNametag.java b/src/main/java/dev/resent/module/impl/setting/SelfNametag.java
similarity index 84%
rename from src/main/java/dev/resent/module/impl/misc/SelfNametag.java
rename to src/main/java/dev/resent/module/impl/setting/SelfNametag.java
index 228d6fb4..b2fb362e 100644
--- a/src/main/java/dev/resent/module/impl/misc/SelfNametag.java
+++ b/src/main/java/dev/resent/module/impl/setting/SelfNametag.java
@@ -1,4 +1,4 @@
-package dev.resent.module.impl.misc;
+package dev.resent.module.impl.setting;
 
 import dev.resent.annotation.Module;
 import dev.resent.module.base.Mod;
diff --git a/src/main/java/dev/resent/sound/SoundManager.java b/src/main/java/dev/resent/sound/SoundManager.java
index d70b61bc..3ab9c3e9 100644
--- a/src/main/java/dev/resent/sound/SoundManager.java
+++ b/src/main/java/dev/resent/sound/SoundManager.java
@@ -62,7 +62,7 @@ public class SoundManager {
     }
 
     // <3
-    public void playAva(){
+    public void playDemo(){
         ISound sound = PositionedSoundRecord.create(new ResourceLocation("minecraft:music.res"), 1);
         Minecraft.getMinecraft().getSoundHandler().stopSounds();
         Minecraft.getMinecraft().getSoundHandler().playSound(sound);
diff --git a/src/main/java/dev/resent/util/misc/W.java b/src/main/java/dev/resent/util/misc/W.java
index c53137e7..134bb6f7 100644
--- a/src/main/java/dev/resent/util/misc/W.java
+++ b/src/main/java/dev/resent/util/misc/W.java
@@ -7,11 +7,9 @@ import dev.resent.module.impl.hud.Hitboxes;
 import dev.resent.module.impl.misc.AutoGG;
 import dev.resent.module.impl.misc.ClearChat;
 import dev.resent.module.impl.misc.DynamicFOV;
-import dev.resent.module.impl.misc.FPSB;
-//import dev.resent.module.impl.misc.NoHurtCam;
-import dev.resent.module.impl.misc.NoParticles;
-import dev.resent.module.impl.misc.NoRain;
 import dev.resent.module.impl.misc.Scoreboard;
+import dev.resent.module.impl.setting.NoParticles;
+import dev.resent.module.impl.setting.NoRain;
 
 public class W {
 
@@ -50,8 +48,4 @@ public class W {
     public static ClearChat clearChat() {
         return ModManager.clearChat;
     }
-
-    public static FPSB fpsb() {
-        return ModManager.fpsb;
-    }
 }
diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java
index f388e220..cae1946d 100644
--- a/src/main/java/net/minecraft/client/Minecraft.java
+++ b/src/main/java/net/minecraft/client/Minecraft.java
@@ -1705,7 +1705,6 @@ public class Minecraft implements IThreadListener {
 		}
 
 		ModManager.scoreboard.setEnabled(true);
-		ModManager.fpsb.setEnabled(true);
 		this.gameSettings.loadOptions();
 		System.gc();
 		this.systemTime = 0L;
diff --git a/src/main/java/net/minecraft/client/settings/GameSettings.java b/src/main/java/net/minecraft/client/settings/GameSettings.java
index 3d1c9cd1..bfee9a32 100644
--- a/src/main/java/net/minecraft/client/settings/GameSettings.java
+++ b/src/main/java/net/minecraft/client/settings/GameSettings.java
@@ -234,7 +234,6 @@ public class GameSettings {
         this.forceUnicodeFont = false;
         this.mc = mcIn;
         ModManager.scoreboard.setEnabled(true);
-        ModManager.fpsb.setEnabled(true);
         GameSettings.Options.RENDER_DISTANCE.setValueMax(18.0F);
 
         this.renderDistanceChunks = 1;
diff --git a/src/main/java/net/minecraft/util/MathHelper.java b/src/main/java/net/minecraft/util/MathHelper.java
index 287564f7..b29b069b 100644
--- a/src/main/java/net/minecraft/util/MathHelper.java
+++ b/src/main/java/net/minecraft/util/MathHelper.java
@@ -28,26 +28,24 @@ public class MathHelper {
      * A table of sin values computed from 0 (inclusive) to 2*pi
      * (exclusive), with steps of 2*PI / 65536.
      */
-    private static final float[] SIN_TABLE = new float[65536];
     private static final float[] SIN_TABLE_FAST = new float[4096];
     private static final int[] multiplyDeBruijnBitPosition;
     private static final double field_181163_d;
     private static final double[] field_181164_e;
     private static final double[] field_181165_f;
-    public static boolean fastMath = false;
 
     /**+
      * sin looked up in a table
      */
     public static float sin(float parFloat1) {
-        return fastMath ? SIN_TABLE_FAST[(int) (parFloat1 * 651.8986f) & 4095] : SIN_TABLE[(int) (parFloat1 * 10430.378F) & '\uffff'];
+        return SIN_TABLE_FAST[(int) (parFloat1 * 651.8986f) & 4095];
     }
 
     /**+
      * cos looked up in the sin table with the appropriate offset
      */
     public static float cos(float value) {
-        return fastMath ? SIN_TABLE_FAST[(int) ((value + ((float) Math.PI / 2f)) * 651.8986f) & 4095] : SIN_TABLE[(int) (value * 10430.378F + 16384.0F) & '\uffff'];
+        return SIN_TABLE_FAST[(int) ((value + ((float) Math.PI / 2f)) * 651.8986f) & 4095];
     }
 
     public static float sqrt_float(float value) {
@@ -487,9 +485,6 @@ public class MathHelper {
     }
 
     static {
-        for (int i = 0; i < 65536; ++i) {
-            SIN_TABLE[i] = (float) Math.sin((double) i * 3.141592653589793D * 2.0D / 65536.0D);
-        }
 
         for (int j = 0; j < 4096; ++j) {
             SIN_TABLE_FAST[j] = (float) Math.sin(((float) j + 0.5f) / 4096.0f * ((float) Math.PI * 2f));