diff --git a/config.js b/config.js
index 47e182e8..843a9367 100644
--- a/config.js
+++ b/config.js
@@ -9517,13 +9517,14 @@ var toReturn = {
 					}
 				}
 			},
-			expandingBase: function(){
+			expandingBase: function(useLevelTemp = false){
 				var mult = 0.003;
-				if (game.portal.Expansion.radLevel > 0) mult += (0.0001 * game.portal.Expansion.radLevel);
+				var level = game.portal.Expansion.radLevel + (useLevelTemp ? game.portal.Expansion.levelTemp : 0);
+				if (game.portal.Expansion.radLevel > 0) mult += (0.0001 * level);
 				return mult;
 			},
-			expandingMult: function(){			
-				return Math.pow((this.expandingBase() + 1), game.unlocks.impCount.Tauntimp)
+			expandingMult: function(useLevelTemp = false){			
+				return Math.pow((this.expandingBase(useLevelTemp) + 1), game.unlocks.impCount.Tauntimp)
 			}
 		},
 		Whipimp: {
diff --git a/main.js b/main.js
index 20646d70..801a4201 100644
--- a/main.js
+++ b/main.js
@@ -3937,7 +3937,7 @@ function canCommitCarpentry(noInfinity){ //Uh, and Coordinated. This checks coor
 	newMax *= game.resources.trimps.maxMod;
 	newMax = Math.floor(newMax * (Math.pow(1 + game.portal.Carpentry.modifier, getPerkLevel("Carpentry") + game.portal.Carpentry.levelTemp)));
 	if (typeof game.portal.Carpentry_II.levelTemp !== 'undefined') newMax = Math.floor(newMax * (1 + (game.portal.Carpentry_II.modifier * (getPerkLevel("Carpentry_II") + game.portal.Carpentry_II.levelTemp))));
-	if (game.global.expandingTauntimp) newMax = Math.floor(newMax * game.badGuys.Tauntimp.expandingMult());
+	if (game.global.expandingTauntimp) newMax = Math.floor(newMax * game.badGuys.Tauntimp.expandingMult(true));
 	newMax = Math.floor(newMax * (alchObj.getPotionEffect("Elixir of Crafting")));
 	if (autoBattle.bonuses.Scaffolding.level > 0) newMax = Math.floor(newMax * autoBattle.bonuses.Scaffolding.getMult());
 	if (game.global.universe == 2 && u2Mutations.tree.Trimps.purchased) newMax *= 1.5;
@@ -11088,14 +11088,16 @@ function battleCoordinator(makeUp) {
     game.global.battleCounter += (1000 / game.settings.speed);
 	var num = (getPerkLevel("Agility")) ? 1000 * Math.pow(1 - game.portal.Agility.modifier, getPerkLevel("Agility")) : 1000;
 	if (game.talents.hyperspeed.purchased) num -= 100;
-	if (game.talents.hyperspeed2.purchased){
+	
+	if (game.global.mapExtraBonus == "fa") {
+		num -= 100;
+	} else if (game.talents.hyperspeed2.purchased){
 		var hsZoneMod = game.talents.liquification3.purchased ? 0.75 : 0.5;
 		if (game.global.world <= Math.floor((getHighestLevelCleared(false, true) + 1) * hsZoneMod)){
 			num -= 100;
 		}
 	}
-	else if (game.global.mapExtraBonus == "fa")
-		num -= 100;
+	
 	if (!game.global.mapsActive && game.global.gridArray[0].name == "Liquimp" && num < 400)
 		num = 400;
 	if (game.global.challengeActive == "Quagmire") num += game.challenges.Quagmire.getSpeedPenalty();