diff --git a/af/lockandkey.af b/af/lockandkey.af
index 11b00a2..6f4639d 100644
--- a/af/lockandkey.af
+++ b/af/lockandkey.af
@@ -44,16 +44,16 @@ STATE: {Default}
 				Chat {/vt opt set enablecombat false}
 				Chat {/vt opt set enablelooting false}
 				Chat {/vt opt set enablenav false}
-				Chat {/vt opt set enablebuffing true}
+				Chat {/vt opt set enablebuffing false}
 				SetState {service_quest_refresh}
 ~~ }
 
 STATE: {idle}
-~~ Main loop: listen for portal tells, check service timer, handle buffs
+~~ Main loop: listen for portal tells, check service timer
 	IF:	Death
 		DO:	SetState {death}
-	IF:	NeedToBuff
-		DO:	SetState {buffing}
+	IF:	Always
+		DO:	Chat {/vt opt set enablebuffing false}
 	~~ Listen for tells containing "primary"
 	IF:	ChatCapture {(^(\[[A-z]+?\] |)You|.*\<Tell:IIDString:.+:(?<who>[^\<]*)\>.+\<\\Tell\>) .*, ".*primary.*"$} {}
 		DO:	SetState {summon_primary}
@@ -69,7 +69,7 @@ STATE: {idle}
 		DO:	None
 
 STATE: {summon_primary}
-~~ Face 180, equip wand, cast Summon Primary Portal I (157) with retries
+~~ Face 180, equip wand, cast Summon Primary Portal I (157), retry on fizzle
 	IF:	Death
 		DO:	SetState {death}
 	IF:	Always
@@ -79,15 +79,16 @@ STATE: {summon_primary}
 				DoExpr {actiontryequipanywand[]}
 	IF:	SecsInStateGE 4
 		DO:	DoExpr {actiontrycastbyid[157]}
-	IF:	SecsInStateGE 7
-		DO:	DoExpr {actiontrycastbyid[157]}
-	IF:	SecsInStateGE 10
-		DO:	DoExpr {actiontrycastbyid[157]}
+	~~ Fizzle: retry cast
+	IF:	ChatMatch {Your spell fizzled.}
+		DO:	DoAll
+				DoExpr {actiontrycastbyid[157]}
+				SetState {summon_primary}
 	IF:	SecsInStateGE 17
 		DO:	SetState {idle}
 
 STATE: {summon_secondary}
-~~ Face 90, equip wand, cast Summon Secondary Portal I (2648) with retries
+~~ Face 90, equip wand, cast Summon Secondary Portal I (2648), retry on fizzle
 	IF:	Death
 		DO:	SetState {death}
 	IF:	Always
@@ -97,22 +98,14 @@ STATE: {summon_secondary}
 				DoExpr {actiontryequipanywand[]}
 	IF:	SecsInStateGE 4
 		DO:	DoExpr {actiontrycastbyid[2648]}
-	IF:	SecsInStateGE 7
-		DO:	DoExpr {actiontrycastbyid[2648]}
-	IF:	SecsInStateGE 10
-		DO:	DoExpr {actiontrycastbyid[2648]}
+	~~ Fizzle: retry cast
+	IF:	ChatMatch {Your spell fizzled.}
+		DO:	DoAll
+				DoExpr {actiontrycastbyid[2648]}
+				SetState {summon_secondary}
 	IF:	SecsInStateGE 17
 		DO:	SetState {idle}
 
-STATE: {buffing}
-~~ Wait for buffs to complete, then return to idle
-	IF:	Death
-		DO:	SetState {death}
-	IF:	Not NeedToBuff
-		DO:	SetState {idle}
-	IF:	SecsInStateGE 120
-		DO:	SetState {idle}
-
 STATE: {service_quest_refresh}
 ~~ Request quest status refresh, wait for completion
 	IF:	Death
@@ -207,7 +200,7 @@ STATE: {service_bella_start}
 				Chat {/vt opt set enablecombat false}
 				Chat {/vt opt set enablelooting false}
 				Chat {/vt opt set enablenav false}
-				Chat {/vt opt set enablebuffing true}
+				Chat {/vt opt set enablebuffing false}
 	IF:	SecsInStateGE 2
 		DO:	DoAll
 				Chat {/a [bella] starting marketplace entry}
@@ -230,7 +223,6 @@ STATE: {service_bella_mp_primary}
 		DO:	SetState {service_bella_backoff}
 	IF:	Always
 		DO:	DoAll
-				Chat {/vt opt set enablebuffing true}
 				Chat {/vt opt set enablenav true}
 				Chat {/vt opt set enablecombat false}
 				Chat {/vt opt set enablelooting false}
@@ -304,6 +296,8 @@ STATE: {service_bella_jaw_hunt}
 ~~ Hunt for jaw drop
 	IF:	Death
 		DO:	SetState {death}
+	IF:	Always
+		DO:	Chat {/vt opt set enablebuffing true}
 	IF:	ExitPortal
 		DO:	DoAll
 				Chat {/vt opt set enablenav true}
@@ -374,7 +368,7 @@ STATE: {service_reset_main}
 				Chat {/vt opt set enablecombat false}
 				Chat {/vt opt set enablelooting false}
 				Chat {/vt opt set enablenav true}
-				Chat {/vt opt set enablebuffing true}
+				Chat {/vt opt set enablebuffing false}
 				DoExpr {setvar[serviceClock,stopwatchcreate[]]}
 				DoExpr {stopwatchstart[getvar[serviceClock]]}
 				DoExpr {touchvar[resetNavLoaded]}
diff --git a/met/lockandkey.met b/met/lockandkey.met
index 75b47f0..77c32df 100644
--- a/met/lockandkey.met
+++ b/met/lockandkey.met
@@ -11,7 +11,7 @@ n
 n
 n
 n
-92
+88
 i
 21
 i
@@ -399,7 +399,7 @@ s
 i
 2
 s
-/vt opt set enablebuffing true
+/vt opt set enablebuffing false
 i
 1
 s
@@ -417,13 +417,13 @@ death
 s
 idle
 i
-15
-i
 1
 i
+2
+i
 0
 s
-buffing
+/vt opt set enablebuffing false
 s
 idle
 i
@@ -589,9 +589,18 @@ actiontrycastbyid[157]
 s
 summon_primary
 i
-6
+4
 i
-7
+3
+s
+Your spell fizzled.
+TABLE
+2
+K
+V
+n
+n
+2
 i
 7
 TABLE
@@ -605,25 +614,10 @@ s
 e
 s
 actiontrycastbyid[157]
+i
+1
 s
 summon_primary
-i
-6
-i
-7
-i
-10
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-actiontrycastbyid[157]
 s
 summon_primary
 i
@@ -702,9 +696,18 @@ actiontrycastbyid[2648]
 s
 summon_secondary
 i
-6
+4
 i
-7
+3
+s
+Your spell fizzled.
+TABLE
+2
+K
+V
+n
+n
+2
 i
 7
 TABLE
@@ -718,25 +721,10 @@ s
 e
 s
 actiontrycastbyid[2648]
+i
+1
 s
 summon_secondary
-i
-6
-i
-7
-i
-10
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-actiontrycastbyid[2648]
 s
 summon_secondary
 i
@@ -758,45 +746,6 @@ i
 s
 death
 s
-buffing
-i
-21
-i
-1
-TABLE
-2
-K
-V
-n
-n
-1
-i
-15
-i
-0
-s
-idle
-s
-buffing
-i
-6
-i
-1
-i
-120
-s
-idle
-s
-buffing
-i
-8
-i
-1
-i
-0
-s
-death
-s
 service_quest_refresh
 i
 1
@@ -1559,7 +1508,7 @@ s
 i
 2
 s
-/vt opt set enablebuffing true
+/vt opt set enablebuffing false
 s
 service_bella_start
 i
@@ -1691,11 +1640,7 @@ K
 V
 n
 n
-6
-i
-2
-s
-/vt opt set enablebuffing true
+5
 i
 2
 s
@@ -2149,6 +2094,16 @@ death
 s
 service_bella_jaw_hunt
 i
+1
+i
+2
+i
+0
+s
+/vt opt set enablebuffing true
+s
+service_bella_jaw_hunt
+i
 20
 i
 3
@@ -2645,7 +2600,7 @@ s
 i
 2
 s
-/vt opt set enablebuffing true
+/vt opt set enablebuffing false
 i
 7
 TABLE