diff --git a/mods/gennext/README.md b/mods/gennext/README.md
index a228557297..6c69f8c300 100644
--- a/mods/gennext/README.md
+++ b/mods/gennext/README.md
@@ -123,8 +123,8 @@ Major changes:
   hits again for 80 base power. It's like Doom Desire, except it still hits
   that first time.
 
-- Confusion now deals damage every attack, but does not stop the attack. It
-  now lasts 3-5 turns.
+- Confusion now deals 30 base power damage every attack, but does not stop
+  the attack. It now lasts 3-5 turns.
 
 - Parental Bond now deals half damage on both hits, but confers perfect
   accuracy like all multi-hit moves.
@@ -135,8 +135,6 @@ Major changes:
 
 - Twister is now a 80 base power Flying move with a 30% confusion chance
 
-- Mega Gengar now has Intimidate, and Mega Lucario now has Iron Fist
-
 - Diancie is released
 
 New mechanic: Signature Pokemon:
@@ -353,8 +351,6 @@ Minor learnset changes:
 
 - Butterfree, Beautifly, Masquerain, and Mothim get Hurricane
 
-- Shuckle gets Leech Seed
-
 - Roserade gets Sludge
 
 - Meloetta gets Fiery Dance
@@ -411,6 +407,10 @@ Minor ability changes:
   provides immunity to Hail and freeze, and provides a one-time immunity
   to Water and Ice, after which it turns into Shell Armor
 
+- Adaptability is now 1.33x to non-STAB moves instead of to STAB moves
+
+- Shadow Tag now lasts only one turn
+
 - Static and Poison Point have a 100% chance of activating
 
 - Speed Boost does not activate on turns Protect, Detect, Endure, etc
diff --git a/mods/gennext/abilities.js b/mods/gennext/abilities.js
index 50670eb869..07ea86762c 100644
--- a/mods/gennext/abilities.js
+++ b/mods/gennext/abilities.js
@@ -535,6 +535,33 @@ exports.BattleAbilities = {
 		num: -6,
 		gen: 6
 	},
+	"adaptability": {
+		inherit: true,
+		onModifyMove: function(move) {},
+		onBasePower: function(power, attacker, defender, move) {
+			if (!attacker.hasType(move.type)) {
+				return this.chainModify(1.33);
+			}
+		}
+	},
+	"shadowtag": {
+		onStart: function(pokemon) {
+			pokemon.addVolatile('shadowtag');
+		},
+		effect: {
+			duration: 1,
+			onFoeModifyPokemon: function(pokemon) {
+				if (pokemon.ability !== 'shadowtag') {
+					pokemon.tryTrap();
+				}
+			}
+		},
+		onFoeMaybeTrapPokemon: function(pokemon) {
+			if (pokemon.ability !== 'shadowtag') {
+				pokemon.maybeTrapped = true;
+			}
+		}
+	},
 	"justified": {
 		inherit: true,
 		onBasePowerPriority: 100,
diff --git a/mods/gennext/scripts.js b/mods/gennext/scripts.js
index bb5780f92e..552458b6e5 100644
--- a/mods/gennext/scripts.js
+++ b/mods/gennext/scripts.js
@@ -12,9 +12,6 @@ exports.BattleScripts = {
 		// Masquerain also gets Surf because we want it to be viable
 		this.modData('Learnsets', 'masquerain').learnset.surf = ['5M'];
 
-		// Shuckle gets Leech Seed
-		this.modData('Learnsets', 'shuckle').learnset.leechseed = ['5L100'];
-
 		// Roserade gets Sludge
 		this.modData('Learnsets', 'roserade').learnset.sludge = ['5L100'];
 
@@ -62,9 +59,6 @@ exports.BattleScripts = {
 		// Aipom: eggSketch! :D
 		this.modData('Learnsets', 'aipom').learnset.sketch = ['5E'];
 
-		// Azumarill: free Belly Drum
-		this.modData('Learnsets', 'azumarill').learnset.bellydrum = ['5L100'];
-
 		// Spinda: free Superpower
 		this.modData('Learnsets', 'spinda').learnset.superpower = ['5L100'];
 
@@ -99,10 +93,6 @@ exports.BattleScripts = {
 		// Samurott
 		this.modData('Pokedex', 'samurott').abilities['1'] = 'Technician';
 
-		// nerf some megas
-		this.modData('Pokedex', 'gengarmega').abilities['0'] = 'Intimidate';
-		this.modData('Pokedex', 'lucariomega').abilities['0'] = 'Iron Fist';
-
 		// Levitate mons
 		this.modData('Pokedex', 'unown').abilities['1'] = 'Adaptability';
 		this.modData('Pokedex', 'flygon').abilities['1'] = 'Compoundeyes';
diff --git a/mods/gennext/statuses.js b/mods/gennext/statuses.js
index 91f925e77f..b982a52b9f 100644
--- a/mods/gennext/statuses.js
+++ b/mods/gennext/statuses.js
@@ -52,7 +52,7 @@ exports.BattleStatuses = {
 			var result = this.runEvent('TryConfusion', target, source, sourceEffect);
 			if (!result) return result;
 			this.add('-start', target, 'confusion');
-			this.effectData.time = this.random(3,5);
+			this.effectData.time = this.random(3,4);
 		},
 		onEnd: function(target) {
 			this.add('-end', target, 'confusion');
@@ -63,7 +63,7 @@ exports.BattleStatuses = {
 				pokemon.removeVolatile('confusion');
 				return;
 			}
-			this.directDamage(this.getDamage(pokemon,pokemon,40));
+			this.directDamage(this.getDamage(pokemon,pokemon,30));
 		}
 	},