diff --git a/nav/nav_jawaqibnjanath.nav b/nav/nav_jawaqibnjanath.nav
index fc58099..a790e04 100644
--- a/nav/nav_jawaqibnjanath.nav
+++ b/nav/nav_jawaqibnjanath.nav
@@ -1,511 +1,511 @@
-uTank2 NAV 1.2
-2
-93
-4
--45.3942275365194
--63.5643209457397
-0.283354187011719
-0
-/ah
-3
--45.3942275365194
--63.5643209457397
-0.283354187011719
-0
-15000
-0
-59.3349650382996
--28.5986352920532
-0.0500208298365275
-0
-0
-59.3422830581665
--28.6478862762451
-0.0500208298365275
-0
-0
-59.3745415687561
--28.7087308883667
-0.0500208298365275
-0
-6
--45.3942275365194
--63.5643209457397
-0.283354187011719
-0
-Portal to Town Network
-14
-True
-59.3936458587647
--28.7256083488464
-0.0508250035345554
-0
--101.487263329824
--96.6416310628255
-2.08333134651184E-05
-0
-0
--101.426060072581
--96.6713267644246
-2.08333134651184E-05
-0
-0
--101.415002822876
--96.6800889650981
-2.08333134651184E-05
-0
-0
--101.410864003499
--96.696038945516
-2.08333134651184E-05
-0
-6
--45.3942275365194
--63.5643209457397
-0.283354187011719
-0
-Portal to Yanshi
-14
-True
--101.408554140727
--96.7098208427429
--0.000262499845121056
-0
-42.570612970988
--12.3978833516439
-0.135118023554484
-0
-0
-43.117503229777
--12.0324651400248
-0.163984711964925
-0
-0
-44.3272780100505
--11.2182702700297
-0.0973679860432943
-0
-0
-44.7140724817912
--10.9568198521932
-0.0774464686711629
-0
-0
-45.0523721059163
--10.7322178781033
-0.0985389868418376
-0
-0
-45.510213804245
--10.4240825653076
-0.0838116486867269
-0
-0
-45.5792653083801
--10.39835729599
-0.0793243885040283
-0
-0
-45.611367225647
--10.3886341412862
-0.0782402276992798
-0
-6
--45.3942275365194
--63.5643209457397
-0.283354187011719
-0
-Imuth Maer Cottages Portal
-14
-True
-45.6337008476257
--10.36811876297
-0.0760957673192024
-0
-60.6844003359477
--15.8498600959778
-0.263809172312419
-0
-0
-60.6559405326843
--15.7736094156901
-0.265697415669759
-0
-0
-60.3075848897298
--15.4376958529154
-0.284838072458903
-0
-0
-60.1630346616109
--15.3032150745392
-0.282803789774577
-0
-0
-59.8481479167938
--14.9749188741048
-0.275020853678385
-0
-0
-59.7556303580602
--14.8240637461344
-0.272859477996826
-0
-0
-59.5214548746745
--14.4617527961731
-0.24168750445048
-0
-0
-59.1688228607178
--13.9155393838882
-0.236225891113281
-0
-0
-58.7691486358643
--13.2976042429606
-0.209949890772502
-0
-0
-58.0443833669027
--12.1811443010966
-0.199552790323893
-0
-0
-57.8929854075114
--11.8780462265015
-0.185691356658936
-0
-0
-57.855659866333
--11.68420753479
-0.175492493311564
-0
-0
-57.900355275472
--11.6850378036499
-0.179217116038005
-0
-0
-57.9766059239705
--11.7284083048503
-0.184616231918335
-0
-0
-57.9996327082316
--11.7331106185913
-0.184464550018311
-0
-0
-57.9998336156209
--11.7163631439209
-0.185004790623983
-0
-0
-58.0034070968628
--11.6496791203817
-0.163354174296061
-0
-0
-57.979798634847
--11.6489050547282
-0.163354174296061
-0
-0
-57.968748664856
--11.6485427220662
-0.163354174296061
-0
-0
-57.9585139592489
--11.6487343470256
-0.163354174296061
-0
-0
-57.9589287439982
--11.6140794754028
-0.163354174296061
-0
-6
--45.3942275365194
--63.5643209457397
-0.283354187011719
-0
-Gateway to the Halls of Metos
-14
-True
-57.9596499760946
--11.5774124781291
-0.163070842623711
-0
--99.9346605618795
-92.6503574371338
-2.08333134651184E-05
-0
-0
--99.94812707901
-92.6354245503744
-2.08333134651184E-05
-0
-0
--99.9403787295024
-92.6217887878418
-2.08333134651184E-05
-0
-0
--99.9274781862895
-92.6195088704427
-2.08333134651184E-05
-0
-0
--99.9182874997457
-92.6301512400309
-2.08333134651184E-05
-0
-0
--99.9102941830953
-92.6320143381755
-2.08333134651184E-05
-0
-6
--45.3942275365194
--63.5643209457397
-0.283354187011719
-0
-Surface Portal
-14
-True
--99.8916666666667
-92.6333333333333
--0.000262499845121056
-0
--46.5680209477743
--61.4624371846517
-0.291687520345052
-0
-0
--46.4474327087402
--61.5421078364054
-0.303491465250651
-0
-0
--46.3155998547872
--61.6036398887634
-0.310880915323893
-0
-0
--46.2094100316366
--61.6388254801432
-0.313009516398112
-0
-0
--46.0876953125
--61.6975317319234
-0.313689867655436
-0
-0
--45.987780380249
--61.7263656139374
-0.326870663960775
-0
-0
--45.7395635604858
--61.9928538004557
-0.284223874409993
-0
-0
--45.6000915209452
--62.3942604700724
-0.283354187011719
-0
-0
--45.2575759251912
--62.48324842453
-0.283354187011719
-0
-0
--45.151632754008
--62.4987634499868
-0.283354187011719
-0
-0
--45.1237116495768
--62.5301484107971
-0.283354187011719
-0
-0
--45.0540870984395
--62.6563587506612
-0.283354187011719
-0
-0
--45.0353980541229
--62.7047371983528
-0.283354187011719
-0
-0
--45.0312361796697
--62.7691226323446
-0.284917799631755
-0
-0
--45.0245874722799
--62.8371835708618
-0.284422206878662
-0
-0
--45.2491385142008
--63.095785967509
-0.283354155222575
-0
-0
--45.4886133511861
--63.4006808439891
-0.283354155222575
-0
-0
--45.4615438461304
--63.4462312539419
-0.283354155222575
-0
-0
--45.3942275365194
--63.5643209457397
-0.283354187011719
-0
-0
--44.4704615275065
--63.3698233604431
-0.276725959777832
-0
-0
--44.3865599314372
--63.3625384012858
-0.276128037770589
-0
-0
--44.2351636330287
--63.3710106054942
-0.283354187011719
-0
-0
--44.2088191827138
--63.4109995206197
-0.283354187011719
-0
-0
--44.0094676017761
--63.5868757883708
-0.286731878916423
-0
-0
--43.783557510376
--63.7855415980021
-0.288725694020589
-0
-0
--43.6464767456055
--63.9775186538696
-0.292861938476563
-0
-0
--43.580413945516
--64.0324352900187
-0.314882850646973
-0
-0
--43.5285935799281
--64.0764983177185
-0.326891263326009
-0
-0
--43.4685421228409
--64.1349182764689
-0.337443669637044
-0
-0
--43.4242894887924
--64.1757117112478
-0.333116753896077
-0
-0
--43.4141160011292
--64.2152758598328
-0.315030256907145
-0
-0
--43.4053275108337
--64.3469035218159
-0.28759298324585
-0
-0
--43.3156284809113
--64.7922865549723
-0.283354187011719
-0
-0
--42.7738382339478
--64.7604583740234
-0.283354187011719
-0
-3
--45.3942275365194
--63.5643209457397
-0.283354187011719
-0
-4000
-4
--45.3942275365194
--63.5643209457397
-0.283354187011719
-0
-/ub face 135
-3
--45.3942275365194
--63.5643209457397
-0.283354187011719
-0
-3000
-4
--45.3942275365194
--63.5643209457397
-0.283354187011719
-0
-/ub jumpw 1000
-3
--45.3942275365194
--63.5643209457397
-0.283354187011719
-0
-10000
-0
--42.5006133079529
--65.1091889460882
-0.0193737844626109
-0
-0
--42.4289771080017
--65.2117535273234
-0.0170041084289551
-0
-0
--42.3684973398844
--65.2471349080404
-0.0300325194994609
-0
-0
--42.3523971557617
--65.2599358876546
-0.0329546411832174
-0
-7
--45.3942275365194
--63.5643209457397
-0.283354187011719
-0
-Jawaq ibn Janath
-37
-True
--42.3394416809082
--65.2727708180745
-0.0333541706204414
+uTank2 NAV 1.2
+4
+93
+4
+0.682895914713542
+13.6384128570557
+0.516689586639404
+0
+/ah
+3
+0.682895914713542
+13.6384128570557
+0.516689586639404
+0
+15000
+0
+59.3349650382996
+-28.5986352920532
+0.0500208298365275
+0
+0
+59.3422830581665
+-28.6478862762451
+0.0500208298365275
+0
+0
+59.3745415687561
+-28.7087308883667
+0.0500208298365275
+0
+6
+0.682895914713542
+13.6384128570557
+0.516689586639404
+0
+Portal to Town Network
+14
+True
+59.3936458587647
+-28.7256083488464
+0.0508250035345554
+0
+-101.487263329824
+-96.6416310628255
+2.08333134651184E-05
+0
+0
+-101.426060072581
+-96.6713267644246
+2.08333134651184E-05
+0
+0
+-101.415002822876
+-96.6800889650981
+2.08333134651184E-05
+0
+0
+-101.410864003499
+-96.696038945516
+2.08333134651184E-05
+0
+6
+0.682895914713542
+13.6384128570557
+0.516689586639404
+0
+Portal to Yanshi
+14
+True
+-101.408554140727
+-96.7098208427429
+-0.000262499845121056
+0
+42.570612970988
+-12.3978833516439
+0.135118023554484
+0
+0
+43.117503229777
+-12.0324651400248
+0.163984711964925
+0
+0
+44.3272780100505
+-11.2182702700297
+0.0973679860432943
+0
+0
+44.7140724817912
+-10.9568198521932
+0.0774464686711629
+0
+0
+45.0523721059163
+-10.7322178781033
+0.0985389868418376
+0
+0
+45.510213804245
+-10.4240825653076
+0.0838116486867269
+0
+0
+45.5792653083801
+-10.39835729599
+0.0793243885040283
+0
+0
+45.611367225647
+-10.3886341412862
+0.0782402276992798
+0
+6
+0.682895914713542
+13.6384128570557
+0.516689586639404
+0
+Imuth Maer Cottages Portal
+14
+True
+45.6337008476257
+-10.36811876297
+0.0760957673192024
+0
+60.6844003359477
+-15.8498600959778
+0.263809172312419
+0
+0
+60.6559405326843
+-15.7736094156901
+0.265697415669759
+0
+0
+60.3075848897298
+-15.4376958529154
+0.284838072458903
+0
+0
+60.1630346616109
+-15.3032150745392
+0.282803789774577
+0
+0
+59.8481479167938
+-14.9749188741048
+0.275020853678385
+0
+0
+59.7556303580602
+-14.8240637461344
+0.272859477996826
+0
+0
+59.5214548746745
+-14.4617527961731
+0.24168750445048
+0
+0
+59.1688228607178
+-13.9155393838882
+0.236225891113281
+0
+0
+58.7691486358643
+-13.2976042429606
+0.209949890772502
+0
+0
+58.0443833669027
+-12.1811443010966
+0.199552790323893
+0
+0
+57.8929854075114
+-11.8780462265015
+0.185691356658936
+0
+0
+57.855659866333
+-11.68420753479
+0.175492493311564
+0
+0
+57.900355275472
+-11.6850378036499
+0.179217116038005
+0
+0
+57.9766059239705
+-11.7284083048503
+0.184616231918335
+0
+0
+57.9996327082316
+-11.7331106185913
+0.184464550018311
+0
+0
+57.9998336156209
+-11.7163631439209
+0.185004790623983
+0
+0
+58.0034070968628
+-11.6496791203817
+0.163354174296061
+0
+0
+57.979798634847
+-11.6489050547282
+0.163354174296061
+0
+0
+57.968748664856
+-11.6485427220662
+0.163354174296061
+0
+0
+57.9585139592489
+-11.6487343470256
+0.163354174296061
+0
+0
+57.9589287439982
+-11.6140794754028
+0.163354174296061
+0
+6
+0.682895914713542
+13.6384128570557
+0.516689586639404
+0
+Gateway to the Halls of Metos
+14
+True
+57.9596499760946
+-11.5774124781291
+0.163070842623711
+0
+-99.9346605618795
+92.6503574371338
+2.08333134651184E-05
+0
+0
+-99.94812707901
+92.6354245503744
+2.08333134651184E-05
+0
+0
+-99.9403787295024
+92.6217887878418
+2.08333134651184E-05
+0
+0
+-99.9274781862895
+92.6195088704427
+2.08333134651184E-05
+0
+0
+-99.9182874997457
+92.6301512400309
+2.08333134651184E-05
+0
+0
+-99.9102941830953
+92.6320143381755
+2.08333134651184E-05
+0
+6
+0.682895914713542
+13.6384128570557
+0.516689586639404
+0
+Surface Portal
+14
+True
+-99.8916666666667
+92.6333333333333
+-0.000262499845121056
+0
+-46.5680209477743
+-61.4624371846517
+0.291687520345052
+0
+0
+-46.4474327087402
+-61.5421078364054
+0.303491465250651
+0
+0
+-46.3155998547872
+-61.6036398887634
+0.310880915323893
+0
+0
+-46.2094100316366
+-61.6388254801432
+0.313009516398112
+0
+0
+-46.0876953125
+-61.6975317319234
+0.313689867655436
+0
+0
+-45.987780380249
+-61.7263656139374
+0.326870663960775
+0
+0
+-45.7395635604858
+-61.9928538004557
+0.284223874409993
+0
+0
+-45.6000915209452
+-62.3942604700724
+0.283354187011719
+0
+0
+-45.2575759251912
+-62.48324842453
+0.283354187011719
+0
+0
+-45.151632754008
+-62.4987634499868
+0.283354187011719
+0
+0
+-45.1237116495768
+-62.5301484107971
+0.283354187011719
+0
+0
+-45.0540870984395
+-62.6563587506612
+0.283354187011719
+0
+0
+-45.0353980541229
+-62.7047371983528
+0.283354187011719
+0
+0
+-45.0312361796697
+-62.7691226323446
+0.284917799631755
+0
+0
+-45.0245874722799
+-62.8371835708618
+0.284422206878662
+0
+0
+-45.2491385142008
+-63.095785967509
+0.283354155222575
+0
+0
+-45.4886133511861
+-63.4006808439891
+0.283354155222575
+0
+0
+-45.4615438461304
+-63.4462312539419
+0.283354155222575
+0
+0
+-45.3942275365194
+-63.5643209457397
+0.283354187011719
+0
+0
+-44.4704615275065
+-63.3698233604431
+0.276725959777832
+0
+0
+-44.3865599314372
+-63.3625384012858
+0.276128037770589
+0
+0
+-44.2351636330287
+-63.3710106054942
+0.283354187011719
+0
+0
+-44.2088191827138
+-63.4109995206197
+0.283354187011719
+0
+0
+-44.0094676017761
+-63.5868757883708
+0.286731878916423
+0
+0
+-43.783557510376
+-63.7855415980021
+0.288725694020589
+0
+0
+-43.6464767456055
+-63.9775186538696
+0.292861938476563
+0
+0
+-43.580413945516
+-64.0324352900187
+0.314882850646973
+0
+0
+-43.5285935799281
+-64.0764983177185
+0.326891263326009
+0
+0
+-43.4685421228409
+-64.1349182764689
+0.337443669637044
+0
+0
+-43.4242894887924
+-64.1757117112478
+0.333116753896077
+0
+0
+-43.4141160011292
+-64.2152758598328
+0.315030256907145
+0
+0
+-43.4053275108337
+-64.3469035218159
+0.28759298324585
+0
+0
+-43.3156284809113
+-64.7922865549723
+0.283354187011719
+0
+0
+-42.7738382339478
+-64.7604583740234
+0.283354187011719
+0
+3
+0.682895914713542
+13.6384128570557
+0.516689586639404
+0
+4000
+4
+0.682895914713542
+13.6384128570557
+0.516689586639404
+0
+/ub face 135
+3
+0.682895914713542
+13.6384128570557
+0.516689586639404
+0
+3000
+4
+0.682895914713542
+13.6384128570557
+0.516689586639404
+0
+/ub jumpw 1000
+3
+0.682895914713542
+13.6384128570557
+0.516689586639404
+0
+10000
+0
+-42.5006133079529
+-65.1091889460882
+0.0193737844626109
+0
+0
+-42.4289771080017
+-65.2117535273234
+0.0170041084289551
+0
+0
+-42.3684973398844
+-65.2471349080404
+0.0300325194994609
+0
+0
+-42.3523971557617
+-65.2599358876546
+0.0329546411832174
+0
+7
+0.682895914713542
+13.6384128570557
+0.516689586639404
+0
+Jawaq ibn Janath
+37
+True
+-42.3394416809082
+-65.2727708180745
+0.0333541706204414