diff --git a/data-full.json b/data-full.json
index a63bdd7..d098c55 100644
--- a/data-full.json
+++ b/data-full.json
@@ -2,7 +2,7 @@
   "version": 0.6,
   "generator": "Overpass API 0.7.58.5 b0c4acbb",
   "osm3s": {
-    "timestamp_osm_base": "2022-09-20T03:01:24Z",
+    "timestamp_osm_base": "2022-09-21T03:12:14Z",
     "copyright": "The data included in this document is from www.openstreetmap.org. The data is made available under ODbL."
   },
   "elements": [
@@ -136804,53 +136804,42 @@
 {
   "type": "node",
   "id": 1208639235,
-  "lat": 70.9988389,
-  "lon": 23.8901492,
+  "lat": 70.9988395,
+  "lon": 23.8900527,
   "tags": {
-    "kystverket:information": "Lyktehus",
     "name": "Tufjord",
-    "note": "Fyrlykt",
     "ref:kystverket": "936000",
+    "seamark:conspicuity": "conspicuous",
     "seamark:light:1:character": "Oc",
     "seamark:light:1:colour": "green",
     "seamark:light:1:height": "7.9",
-    "seamark:light:1:national_information": "Fra innpå Leikua til 248 m S. av Svartoksen varde",
-    "seamark:light:1:period": "6",
-    "seamark:light:1:range": "7.6",
-    "seamark:light:1:sector_end": "108.5",
-    "seamark:light:1:sector_start": "102.2",
-    "seamark:light:1:sequence": "5+1",
+    "seamark:light:1:national_information": "Fra innpå Leikua til N av Leikua",
+    "seamark:light:1:period": "4",
+    "seamark:light:1:range": "3.3",
+    "seamark:light:1:sector_end": "109.3",
+    "seamark:light:1:sector_start": "102.3",
+    "seamark:light:1:sequence": "(3)+1",
     "seamark:light:2:character": "Oc",
     "seamark:light:2:colour": "white",
     "seamark:light:2:height": "7.9",
-    "seamark:light:2:national_information": "Til 83 m S av Svartoksen varde",
-    "seamark:light:2:period": "6",
-    "seamark:light:2:range": "10.5",
-    "seamark:light:2:sector_end": "116.1",
-    "seamark:light:2:sector_start": "108.5",
-    "seamark:light:2:sequence": "5+1",
+    "seamark:light:2:national_information": "Til S av Svartoksen",
+    "seamark:light:2:period": "4",
+    "seamark:light:2:range": "4",
+    "seamark:light:2:sector_end": "116.3",
+    "seamark:light:2:sector_start": "109.3",
+    "seamark:light:2:sequence": "(3)+1",
     "seamark:light:3:character": "Oc",
     "seamark:light:3:colour": "red",
     "seamark:light:3:height": "7.9",
-    "seamark:light:3:national_information": "Til innpå Kjerkeneset",
-    "seamark:light:3:period": "6",
-    "seamark:light:3:range": "8.1",
-    "seamark:light:3:sector_end": "147.2",
-    "seamark:light:3:sector_start": "116.1",
-    "seamark:light:3:sequence": "5+1",
-    "seamark:light:4:character": "Oc",
-    "seamark:light:4:colour": "white",
-    "seamark:light:4:height": "7.9",
-    "seamark:light:4:national_information": "Til innpå land i Tufjord S-side",
-    "seamark:light:4:period": "6",
-    "seamark:light:4:range": "10.5",
-    "seamark:light:4:sector_end": "278.3",
-    "seamark:light:4:sector_start": "147.2",
-    "seamark:light:4:sequence": "5+1",
-    "seamark:light:vertical_length": "3.0",
+    "seamark:light:3:national_information": "Til innpå Kjerkenesspira",
+    "seamark:light:3:period": "4",
+    "seamark:light:3:range": "3.3",
+    "seamark:light:3:sector_end": "145.6",
+    "seamark:light:3:sector_start": "116.3",
+    "seamark:light:3:sequence": "(3)+1",
     "seamark:name": "Tufjord",
     "seamark:type": "light_minor",
-    "source:seamark": "Kystverket"
+    "seamark:vertical_length": "3"
   }
 },
 {
@@ -365501,6 +365490,52 @@
     "seamark:type": "beacon_lateral"
   }
 },
+{
+  "type": "node",
+  "id": 5323258247,
+  "lat": 68.7214292,
+  "lon": 16.7967429,
+  "tags": {
+    "ref:kystverket": "835102",
+    "seamark:buoy_lateral:category": "port",
+    "seamark:buoy_lateral:colour": "red",
+    "seamark:buoy_lateral:shape": "spar",
+    "seamark:buoy_lateral:system": "iala-a",
+    "seamark:light:character": "Fl",
+    "seamark:light:colour": "red",
+    "seamark:light:group": "2",
+    "seamark:light:height": "2",
+    "seamark:light:period": "5",
+    "seamark:light:range": "2.5",
+    "seamark:light:sequence": "0.5+(1)+0.5+(3)",
+    "seamark:name": "Svartskjeret",
+    "seamark:radar_reflector": "yes",
+    "seamark:type": "buoy_lateral"
+  }
+},
+{
+  "type": "node",
+  "id": 5323258308,
+  "lat": 68.7207677,
+  "lon": 16.8037299,
+  "tags": {
+    "ref:kystverket": "835101",
+    "seamark:buoy_lateral:category": "starboard",
+    "seamark:buoy_lateral:colour": "green",
+    "seamark:buoy_lateral:shape": "spar",
+    "seamark:buoy_lateral:system": "iala-a",
+    "seamark:light:character": "Fl",
+    "seamark:light:colour": "green",
+    "seamark:light:group": "2",
+    "seamark:light:height": "2",
+    "seamark:light:period": "5",
+    "seamark:light:range": "2.3",
+    "seamark:light:sequence": "0.5+(1)+0.5+(3)",
+    "seamark:name": "Lilleholmen",
+    "seamark:radar_reflector": "yes",
+    "seamark:type": "buoy_lateral"
+  }
+},
 {
   "type": "node",
   "id": 5323258459,
@@ -365635,6 +365670,35 @@
     "seamark:type": "beacon_lateral"
   }
 },
+{
+  "type": "node",
+  "id": 5323260934,
+  "lat": 65.7951699,
+  "lon": 12.4051738,
+  "tags": {
+    "ref:kystverket": "612002",
+    "seamark:beacon_lateral:category": "port",
+    "seamark:beacon_lateral:colour": "red",
+    "seamark:beacon_lateral:conspicuity": "conspicuous",
+    "seamark:beacon_lateral:system": "iala-a",
+    "seamark:beacon_lateral:vertical_length": "18",
+    "seamark:light:1:character": "Iso",
+    "seamark:light:1:colour": "red",
+    "seamark:light:1:height": "8.2",
+    "seamark:light:1:period": "4",
+    "seamark:light:1:range": "4",
+    "seamark:light:1:sequence": "2+(2)",
+    "seamark:light:2:category": "floodlight",
+    "seamark:light:2:character": "F",
+    "seamark:light:2:colour": "yellow",
+    "seamark:light:2:height": "8.2",
+    "seamark:name": "Sørskolten",
+    "seamark:retro_reflector:colour": "red",
+    "seamark:topmark:information": "02",
+    "seamark:topmark:shape": "triangle, point up",
+    "seamark:type": "beacon_lateral"
+  }
+},
 {
   "type": "node",
   "id": 5323261078,
@@ -365665,6 +365729,32 @@
     "seamark:type": "beacon_lateral"
   }
 },
+{
+  "type": "node",
+  "id": 5323261170,
+  "lat": 65.8103471,
+  "lon": 12.4441597,
+  "tags": {
+    "ref:kystverket": "612010",
+    "seamark:beacon_isolated_danger:conspicuity": "conspicuous",
+    "seamark:beacon_isolated_danger:vertical_length": "16",
+    "seamark:light:1:character": "Q",
+    "seamark:light:1:colour": "white",
+    "seamark:light:1:height": "9.5",
+    "seamark:light:1:period": "1",
+    "seamark:light:1:range": "3.4",
+    "seamark:light:1:sequence": "0.2+(0.8)",
+    "seamark:light:2:category": "floodlight",
+    "seamark:light:2:character": "F",
+    "seamark:light:2:colour": "yellow",
+    "seamark:light:2:height": "9.5",
+    "seamark:name": "Purkskallen",
+    "seamark:retro_reflector:colour": "white",
+    "seamark:topmark:information": "10",
+    "seamark:topmark:shape": "triangle, point up",
+    "seamark:type": "beacon_isolated_danger"
+  }
+},
 {
   "type": "node",
   "id": 5323261425,
@@ -368195,6 +368285,24 @@
     "seamark:type": "beacon_lateral"
   }
 },
+{
+  "type": "node",
+  "id": 5324116094,
+  "lat": 64.8270194,
+  "lon": 10.7990627,
+  "tags": {
+    "ref:kystverket": "538002",
+    "seamark:light:character": "Q",
+    "seamark:light:colour": "red",
+    "seamark:light:period": "1",
+    "seamark:light:range": "2",
+    "seamark:light:sequence": "0.2+(0.8)",
+    "seamark:name": "Midtskjæret",
+    "seamark:pile:category": "stake",
+    "seamark:pile:conspicuity": "conspicuous",
+    "seamark:type": "pile"
+  }
+},
 {
   "type": "node",
   "id": 5324117539,
@@ -368518,6 +368626,35 @@
     "seamark:type": "beacon_lateral"
   }
 },
+{
+  "type": "node",
+  "id": 5324134931,
+  "lat": 65.8211475,
+  "lon": 12.4338571,
+  "tags": {
+    "ref:kystverket": "612017",
+    "seamark:beacon_lateral:category": "starboard",
+    "seamark:beacon_lateral:colour": "green",
+    "seamark:beacon_lateral:conspicuity": "conspicuous",
+    "seamark:beacon_lateral:system": "iala-a",
+    "seamark:beacon_lateral:vertical_length": "10",
+    "seamark:light:1:character": "Q",
+    "seamark:light:1:colour": "green",
+    "seamark:light:1:height": "6",
+    "seamark:light:1:period": "1",
+    "seamark:light:1:range": "1.3",
+    "seamark:light:1:sequence": "0.2+(0.8)",
+    "seamark:light:2:category": "floodlight",
+    "seamark:light:2:character": "F",
+    "seamark:light:2:colour": "yellow",
+    "seamark:light:2:height": "6",
+    "seamark:name": "Tjøtta havn",
+    "seamark:retro_reflector:colour": "green",
+    "seamark:topmark:information": "17",
+    "seamark:topmark:shape": "triangle, point up",
+    "seamark:type": "beacon_lateral"
+  }
+},
 {
   "type": "node",
   "id": 5324136384,
@@ -368602,6 +368739,24 @@
     "seamark:type": "beacon_lateral"
   }
 },
+{
+  "type": "node",
+  "id": 5324139470,
+  "lat": 64.8274959,
+  "lon": 10.7811486,
+  "tags": {
+    "ref:kystverket": "538003",
+    "seamark:light:character": "Fl",
+    "seamark:light:colour": "green",
+    "seamark:light:period": "3",
+    "seamark:light:range": "2.3",
+    "seamark:light:sequence": "0.3+(2.7)",
+    "seamark:name": "Langskjæret",
+    "seamark:pile:category": "stake",
+    "seamark:pile:conspicuity": "conspicuous",
+    "seamark:type": "pile"
+  }
+},
 {
   "type": "node",
   "id": 5324139472,
@@ -387746,22 +387901,18 @@
 {
   "type": "node",
   "id": 5325733840,
-  "lat": 71.0015682,
-  "lon": 23.9002645,
+  "lat": 71.0015836,
+  "lon": 23.9002788,
   "tags": {
-    "ref:kystverket": "936200",
-    "seamark:beacon_lateral:category": "port",
-    "seamark:beacon_lateral:colour": "red",
-    "seamark:beacon_lateral:system": "iala-a",
-    "seamark:beacon_lateral:vertical_length": "4.9",
-    "seamark:light:character": "Iso",
+    "ref:kystverket": "936106",
+    "seamark:light:character": "Fl",
     "seamark:light:colour": "red",
-    "seamark:light:height": "5.8",
-    "seamark:light:period": "2",
-    "seamark:light:range": "2.2",
-    "seamark:light:sequence": "1+(1)",
-    "seamark:name": "Storholmsnaget",
-    "seamark:type": "beacon_lateral"
+    "seamark:light:period": "3",
+    "seamark:light:range": "1",
+    "seamark:light:sequence": "0.3+(2.7)",
+    "seamark:name": "Starholmen",
+    "seamark:pile:conspicuity": "not_conspicuous",
+    "seamark:type": "pile"
   }
 },
 {
@@ -403291,17 +403442,18 @@
 {
   "type": "node",
   "id": 5325948809,
-  "lat": 70.9999351,
-  "lon": 23.8872317,
+  "lat": 70.9999557,
+  "lon": 23.8870429,
   "tags": {
-    "ref:kystverket": "936100",
-    "seamark:light:character": "Iso",
+    "ref:kystverket": "936102",
+    "seamark:light:character": "Fl",
     "seamark:light:colour": "red",
     "seamark:light:height": "5.7",
-    "seamark:light:period": "4",
-    "seamark:light:range": "2.6",
-    "seamark:light:sequence": "2+(2)",
+    "seamark:light:period": "3",
+    "seamark:light:range": "1",
+    "seamark:light:sequence": "0.3+(2.7)",
     "seamark:name": "Stangskjærsnaget",
+    "seamark:pile:conspicuity": "not_conspicuous",
     "seamark:pile:vertical_length": "9.2",
     "seamark:type": "pile"
   }
@@ -448399,6 +448551,28 @@
     "seamark:vertical_length": "14.5"
   }
 },
+{
+  "type": "node",
+  "id": 9643869187,
+  "lat": 70.9987334,
+  "lon": 23.8908500,
+  "tags": {
+    "ref:kystverket": "936010",
+    "seamark:light:1:character": "Oc",
+    "seamark:light:1:colour": "white",
+    "seamark:light:1:height": "12.9",
+    "seamark:light:1:national_information": "Overett linje",
+    "seamark:light:1:period": "4",
+    "seamark:light:1:range": "3.6",
+    "seamark:light:1:sector_end": "116.6",
+    "seamark:light:1:sector_start": "108.4",
+    "seamark:light:1:sequence": "(3)+1",
+    "seamark:light:category": "upper",
+    "seamark:name": "Tufjord, øvre",
+    "seamark:pile:vertical_length": "3",
+    "seamark:type": "pile"
+  }
+},
 {
   "type": "node",
   "id": 9643869188,
@@ -451207,6 +451381,120 @@
     "seamark:type": "beacon_lateral"
   }
 },
+{
+  "type": "node",
+  "id": 10039755230,
+  "lat": 66.6288971,
+  "lon": 13.2496968,
+  "tags": {
+    "ref:kystverket": "673918",
+    "seamark:beacon_lateral:category": "port",
+    "seamark:beacon_lateral:colour": "red",
+    "seamark:beacon_lateral:conspicuity": "conspicuous",
+    "seamark:beacon_lateral:system": "iala-a",
+    "seamark:beacon_lateral:vertical_length": "9",
+    "seamark:light:1:character": "Q",
+    "seamark:light:1:colour": "red",
+    "seamark:light:1:height": "5.5",
+    "seamark:light:1:period": "1",
+    "seamark:light:1:range": "2",
+    "seamark:light:1:sequence": "0.2+(0.8)",
+    "seamark:light:2:category": "floodlight",
+    "seamark:light:2:character": "F",
+    "seamark:light:2:colour": "yellow",
+    "seamark:light:2:height": "5.5",
+    "seamark:name": "Steffenholmen",
+    "seamark:retro_reflector:colour": "red",
+    "seamark:topmark:information": "18",
+    "seamark:topmark:shape": "triangle, point up",
+    "seamark:type": "beacon_lateral"
+  }
+},
+{
+  "type": "node",
+  "id": 10039755231,
+  "lat": 66.5152368,
+  "lon": 13.2217787,
+  "tags": {
+    "ref:kystverket": "671307",
+    "seamark:beacon_lateral:category": "starboard",
+    "seamark:beacon_lateral:colour": "green",
+    "seamark:beacon_lateral:conspicuity": "conspicuous",
+    "seamark:beacon_lateral:system": "iala-a",
+    "seamark:beacon_lateral:vertical_length": "8",
+    "seamark:light:1:character": "Q",
+    "seamark:light:1:colour": "green",
+    "seamark:light:1:height": "5",
+    "seamark:light:1:period": "1",
+    "seamark:light:1:range": "2.8",
+    "seamark:light:1:sequence": "0.2+(0.8)",
+    "seamark:light:2:category": "floodlight",
+    "seamark:light:2:character": "F",
+    "seamark:light:2:colour": "yellow",
+    "seamark:light:2:height": "5",
+    "seamark:name": "Steinlandsskjær",
+    "seamark:retro_reflector:colour": "green",
+    "seamark:topmark:information": "07",
+    "seamark:topmark:shape": "triangle, point up",
+    "seamark:type": "beacon_lateral"
+  }
+},
+{
+  "type": "node",
+  "id": 10039755232,
+  "lat": 60.8775025,
+  "lon": 4.7789493,
+  "tags": {
+    "ref:kystverket": "208003",
+    "seamark:beacon_lateral:category": "starboard",
+    "seamark:beacon_lateral:colour": "green",
+    "seamark:beacon_lateral:conspicuity": "conspicuous",
+    "seamark:beacon_lateral:system": "iala-a",
+    "seamark:beacon_lateral:vertical_length": "7.8",
+    "seamark:light:1:character": "Q",
+    "seamark:light:1:colour": "green",
+    "seamark:light:1:height": "10.8",
+    "seamark:light:1:period": "1",
+    "seamark:light:1:range": "3.5",
+    "seamark:light:1:sequence": "0.2+(0.8)",
+    "seamark:light:2:category": "floodlight",
+    "seamark:light:2:character": "F",
+    "seamark:light:2:colour": "yellow",
+    "seamark:light:2:height": "10.8",
+    "seamark:name": "Røytingkalven N",
+    "seamark:retro_reflector:colour": "green",
+    "seamark:topmark:information": "03",
+    "seamark:topmark:shape": "triangle, point up",
+    "seamark:type": "beacon_lateral"
+  }
+},
+{
+  "type": "node",
+  "id": 10039755233,
+  "lat": 58.3385895,
+  "lon": 8.6456777,
+  "tags": {
+    "ref:kystverket": "063847",
+    "seamark:beacon_lateral:category": "starboard",
+    "seamark:beacon_lateral:colour": "green",
+    "seamark:beacon_lateral:system": "iala-a",
+    "seamark:light:1:character": "Iso",
+    "seamark:light:1:colour": "green",
+    "seamark:light:1:height": "4.5",
+    "seamark:light:1:period": "4",
+    "seamark:light:1:range": "2.7",
+    "seamark:light:1:sequence": "2+(2)",
+    "seamark:light:2:category": "floodlight",
+    "seamark:light:2:character": "F",
+    "seamark:light:2:colour": "yellow",
+    "seamark:light:2:height": "4.5",
+    "seamark:name": "Gummerspynten",
+    "seamark:retro_reflector:colour": "green",
+    "seamark:topmark:information": "47",
+    "seamark:topmark:shape": "triangle, point up",
+    "seamark:type": "beacon_lateral"
+  }
+},
 {
   "type": "way",
   "id": 4521451,