diff --git a/nav/ah_rarecomp.nav b/nav/ah_rarecomp.nav
index 650c064..3a69c21 100644
--- a/nav/ah_rarecomp.nav
+++ b/nav/ah_rarecomp.nav
@@ -1,224 +1,187 @@
-uTank2 NAV 1.2
-4
-37
-4
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-/ub face 180
-4
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-/ub setmotion forward 1
-3
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-2000
-4
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-/ub setmotion forward 0
-2
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-1635
-3
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-14000
-3
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-2000
-4
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-/vt opt set enablecombat false
-3
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-2000
-4
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-/ah
-3
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-10000
-0
-59.3248719851176
--28.552663230896
-0.0500208298365275
-0
-0
-59.311270459493
--28.554306602478
-0.0500208298365275
-0
-0
-59.2997538566589
--28.5175615946452
-0.054787011941274
-0
-0
-59.2990102132161
--28.5055706659953
-0.0583541631698608
-0
-6
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-Sawato Meeting Hall Portal
-14
-True
-59.2987999916077
--28.482691637675
-0.0580708347260952
-3
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-15000
-4
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-/ub ig rares.utl to Dunking Rares
-3
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-5000
-4
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-/ub giver .*(100) to Mongot
-3
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-5000
-4
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-/ub givep Mote to Nyckelmonster has leprosy
-3
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-5000
-4
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-/ub mexec iif[getvar[diamondMissing]>0,chatbox[`/t Nyckelmonster has Leprosy, diamond `+cstr[getvar[diamondMissing]]],0]
-3
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-5000
-6
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-Sawato Portal
-14
-True
--101.025
--65.4130499998728
-0.0247374996542931
-0
-59.1273525238037
--28.9174545764923
-0.0500208298365275
-0
-0
-59.2139819463094
--28.8653854052226
-0.0500208298365275
-0
-0
-59.2697760899862
--28.8037387212118
-0.0500208298365275
-0
-0
-59.3118872324626
--28.7463636080424
-0.0500208298365275
-0
-0
-59.3245220502218
--28.7084272384644
-0.0500208298365275
-0
-0
-59.327663675944
--28.6421061197917
-0.0500208298365275
-0
-0
-59.3231418927511
--28.5616776148478
-0.0500208298365275
-0
-0
-59.5516892115275
--28.407174428304
-0.0500208298365275
-0
-3
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-2000
-5
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-2090184732
-Archmage Tawa Matema
-3
-59.5416052500407
--28.4145641962687
-0.0500208298365275
-0
-2000
+uTank2 NAV 1.2
+4
+31
+4
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+/ub face 180
+4
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+/ub setmotion forward 1
+3
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+2000
+4
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+/ub setmotion forward 0
+2
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+1635
+3
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+14000
+3
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+2000
+4
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+/vt opt set enablecombat false
+3
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+2000
+4
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+/ah
+3
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+15000
+4
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+/ub ig rares.utl to Dunking Rares
+3
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+5000
+4
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+/ub giver .*(100) to Mongot
+3
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+5000
+4
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+/ub givep Mote to Nyckelmonster has leprosy
+3
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+5000
+4
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+/ub mexec iif[getvar[diamondMissing]>0,chatbox[`/t Nyckelmonster has Leprosy, diamond `+cstr[getvar[diamondMissing]]],0]
+3
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+5000
+6
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+Sawato Portal
+14
+True
+-101.025
+-65.4130499998728
+0.0247374996542931
+0
+59.1273525238037
+-28.9174545764923
+0.0500208298365275
+0
+0
+59.2139819463094
+-28.8653854052226
+0.0500208298365275
+0
+0
+59.2697760899862
+-28.8037387212118
+0.0500208298365275
+0
+0
+59.3118872324626
+-28.7463636080424
+0.0500208298365275
+0
+0
+59.3245220502218
+-28.7084272384644
+0.0500208298365275
+0
+0
+59.327663675944
+-28.6421061197917
+0.0500208298365275
+0
+0
+59.3231418927511
+-28.5616776148478
+0.0500208298365275
+0
+0
+59.5516892115275
+-28.407174428304
+0.0500208298365275
+0
+3
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+2000
+5
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+2090184732
+Archmage Tawa Matema
+3
+59.3192666689555
+-28.5640083312988
+0.0500250021616618
+0
+2000