diff --git a/bore.af b/bore.af
index 7be108a..b75e589 100644
--- a/bore.af
+++ b/bore.af
@@ -37,7 +37,7 @@
 ~~		prt (deprecated in VTank)														
 ~~ }
 
-~~ /ub mexec setvar[navNumber,VILKETNUMMER]																					
+~~ /ub mexec setvar[navNumber,VILKETNUMMER]												
 STATE: {combat} ~~ {
 	IF:	Always
 		DO:	Chat {/vt opt set enablecombat true}
@@ -62,8 +62,6 @@ STATE: {death} ~~ {
 STATE: {hunt} ~~ {
 	IF:	Always
 		DO:	Chat {/vt opt set enablecombat false}
-	IF:	Always
-		DO:	Chat {/vt opt set enablelooting true}
 	IF:	Death
 		DO:	DoAll
 				Chat {/a I died! But I will comeback!}
@@ -92,8 +90,6 @@ STATE: {hunt} ~~ {
 			Expr {stopwatchelapsedseconds[getvar[lootclock]]>21600}
 		DO: DoAll
 				Chat {/vt opt set enablecombat true}
-				Chat {/vt opt set lootonlyrarecorpses false}
-				Chat {/vt opt set lootpriorityboost false}
 				SetState {loot}
 	IF:	All
 			Expr {setvar[portal, wobjectfindnearestbyobjectclass[14]]}
@@ -114,16 +110,28 @@ STATE: {hunt} ~~ {
 				SetState {avoid_portal}
 
 ~~ }
+STATE: {loot_rare} ~~ {
+	IF:	Always
+		DO:	DoAll
+				Chat {/vt opt set enablelooting true}
+				Chat {/vt opt set enablenav false}
+	IF:	SecsInStateGE 30
+		DO:	DoAll
+				Chat {/vt opt set enablelooting false}
+				Chat {/vt opt set enablenav true}
+				SetState {hunt}
+~~ }
 STATE: {Default} ~~ {
 	IF:	All
 		DO:	DoAll
-				ChatExpr {\/vt nav load bore_circuit+getvar[navNumber]}
 				Chat {/ub opt set VTank.PatchExpressionEngine true}
+				ChatExpr {\/vt nav load bore_circuit+getvar[navNumber]}
 				Chat {/vt opt set enablenav true}
 				Chat {/vt opt set buffprofile_prots 2}
 				Chat {/vt opt set buffprofile_banes 5}
-				Chat {/vt opt set enablelooting true}
+				Chat {/vt opt set enablelooting false}
 				Chat {/vt opt set navpriorityboost false}
+				Chat {/vt opt set lootpriorityboost true}	
 				Chat {/vt opt set lootonlyrarecorpses true}
 				DoExpr {setvar[lootclock,stopwatchcreate[]]}
 				DoExpr {stopwatchstart[getvar[lootclock]]}
@@ -208,10 +216,16 @@ STATE: {stuck} ~~ {
 				SetState {hunt}
 ~~ }
 STATE: {loot} ~~ {
+	IF:	Always
+		DO:	DoAll
+				Chat {/vt opt set enablelooting true}
+				Chat {/vt opt set lootonlyrarecorpses false}
+				Chat {/vt opt set lootpriorityboost false}
 	IF:	SecsInStateGE 300
 		DO: DoAll
 				Chat {/vt opt set lootonlyrarecorpses true}
-				Chat {/vt opt set lootpriorityboost true}	
+				Chat {/vt opt set lootpriorityboost true}
+				Chat {/vt opt set enablelooting false}				
 				DoExpr {setvar[lootclock,stopwatchcreate[]]}
 				DoExpr {stopwatchstart[getvar[lootclock]]}
 				SetState {hunt}