diff --git a/cleaned/accesspoints.json b/cleaned/accesspoints.json
index aa008c8..b1b7628 100644
--- a/cleaned/accesspoints.json
+++ b/cleaned/accesspoints.json
@@ -1,620 +1,620 @@
 {
 	"ap-r5-m2-001": {
 		"id": "ap-r5-m2-001",
-		"x": 0.6729122810905036,
-		"y": 0.9095618486265299,
+		"x": 0.6407456087090069,
+		"y": 0.9127220646746622,
 		"group": ""
 	},
 	"ap-r5-m5-001": {
 		"id": "ap-r5-m5-001",
-		"x": 0.6729122810905036,
-		"y": 0.9095618486265299,
+		"x": 0.6407456087090069,
+		"y": 0.9127220646746622,
 		"group": ""
 	},
 	"ap-r5-m2-002": {
 		"id": "ap-r5-m2-002",
-		"x": 0.5765422455627202,
-		"y": 0.9095618486265299,
+		"x": 0.5842624274070847,
+		"y": 0.9127220646746622,
 		"group": ""
 	},
 	"ap-r5-m5-002": {
 		"id": "ap-r5-m5-002",
-		"x": 0.5765422455627202,
-		"y": 0.9095618486265299,
+		"x": 0.5842624274070847,
+		"y": 0.9127220646746622,
 		"group": ""
 	},
 	"ap-r5-m2-003": {
 		"id": "ap-r5-m2-003",
-		"x": 0.38073873414729625,
-		"y": 0.9058687318575639,
+		"x": 0.3708446136592544,
+		"y": 0.909150457522876,
 		"group": ""
 	},
 	"ap-r5-m5-003": {
 		"id": "ap-r5-m5-003",
-		"x": 0.4449638813179995,
-		"y": 0.9058687318575639,
+		"x": 0.4367532662347403,
+		"y": 0.909150457522876,
 		"group": ""
 	},
 	"ap-r5-m2-004": {
 		"id": "ap-r5-m2-004",
-		"x": 0.38073873414729625,
-		"y": 0.9058687318575639,
+		"x": 0.3708446136592544,
+		"y": 0.909150457522876,
 		"group": ""
 	},
 	"ap-r5-m5-004": {
 		"id": "ap-r5-m5-004",
-		"x": 0.4449638813179995,
-		"y": 0.9058687318575639,
+		"x": 0.4367532662347403,
+		"y": 0.909150457522876,
 		"group": ""
 	},
 	"ap-r4-m2-002": {
 		"id": "ap-r4-m2-002",
-		"x": 0.5915953895130256,
-		"y": 0.6401452872136912,
+		"x": 0.5963916052945505,
+		"y": 0.6112998507068211,
 		"group": ""
 	},
 	"ap-r4-m5-002": {
 		"id": "ap-r4-m5-002",
-		"x": 0.5915953895130256,
-		"y": 0.6401452872136912,
+		"x": 0.5963916052945505,
+		"y": 0.6112998507068211,
 		"group": ""
 	},
 	"ap-r4-m2-001": {
 		"id": "ap-r4-m2-001",
-		"x": 0.6376411693884938,
-		"y": 0.6401452872136912,
+		"x": 0.6409224032630203,
+		"y": 0.6112998507068211,
 		"group": ""
 	},
 	"ap-r4-m5-001": {
 		"id": "ap-r4-m5-001",
-		"x": 0.6376411693884938,
-		"y": 0.6401452872136912,
+		"x": 0.6409224032630203,
+		"y": 0.6112998507068211,
 		"group": ""
 	},
 	"ap-r4-m2-003": {
 		"id": "ap-r4-m2-003",
-		"x": 0.7644461802093258,
-		"y": 0.6659712527790704,
+		"x": 0.763555320623174,
+		"y": 0.6362796711264135,
 		"group": ""
 	},
 	"ap-r4-m5-003": {
 		"id": "ap-r4-m5-003",
-		"x": 0.7644461802093258,
-		"y": 0.6659712527790704,
+		"x": 0.763555320623174,
+		"y": 0.6362796711264135,
 		"group": ""
 	},
 	"ap-r4-m2-004": {
 		"id": "ap-r4-m2-004",
-		"x": 0.8269706471079202,
-		"y": 0.6659712527790704,
+		"x": 0.8240226297029136,
+		"y": 0.6362796711264135,
 		"group": ""
 	},
 	"ap-r4-m5-004": {
 		"id": "ap-r4-m5-004",
-		"x": 0.8269706471079202,
-		"y": 0.6659712527790704,
+		"x": 0.8240226297029136,
+		"y": 0.6362796711264135,
 		"group": ""
 	},
 	"ap-r4-m2-020": {
 		"id": "ap-r4-m2-020",
-		"x": 0.8110145361076027,
-		"y": 0.517323302828189,
+		"x": 0.8085915010036215,
+		"y": 0.49252248326702047,
 		"group": ""
 	},
 	"ap-r4-m5-020": {
 		"id": "ap-r4-m5-020",
-		"x": 0.8110145361076027,
-		"y": 0.517323302828189,
+		"x": 0.8085915010036215,
+		"y": 0.49252248326702047,
 		"group": ""
 	},
 	"ap-r1-m2-002": {
 		"id": "ap-r1-m2-002",
-		"x": 0.5901920051408185,
-		"y": 0.09982383833012029,
+		"x": 0.6393330380804755,
+		"y": 0.11659654411291992,
 		"group": ""
 	},
 	"ap-r1-m5-002": {
 		"id": "ap-r1-m5-002",
-		"x": 0.5901920051408185,
-		"y": 0.09982383833012029,
+		"x": 0.6393330380804755,
+		"y": 0.11659654411291992,
 		"group": ""
 	},
 	"ap-r1-m2-004": {
 		"id": "ap-r1-m2-004",
-		"x": 0.4071500587205566,
-		"y": 0.09455745381757481,
+		"x": 0.4180148293128942,
+		"y": 0.08366275456629972,
 		"group": ""
 	},
 	"ap-r1-m5-004": {
 		"id": "ap-r1-m5-004",
-		"x": 0.4071500587205566,
-		"y": 0.09455745381757481,
+		"x": 0.4180148293128942,
+		"y": 0.08366275456629972,
 		"group": ""
 	},
 	"ap-r1-m2-003": {
 		"id": "ap-r1-m2-003",
-		"x": 0.48646528100925496,
-		"y": 0.09455745381757481,
+		"x": 0.49472045030822975,
+		"y": 0.08366275456629972,
 		"group": ""
 	},
 	"ap-r1-m5-003": {
 		"id": "ap-r1-m5-003",
-		"x": 0.48646528100925496,
-		"y": 0.09455745381757481,
+		"x": 0.49472045030822975,
+		"y": 0.08366275456629972,
 		"group": ""
 	},
 	"ap-r1-m2-005": {
 		"id": "ap-r1-m2-005",
-		"x": 0.6023959095038668,
-		"y": 0.25282966606838175,
+		"x": 0.6068367704099491,
+		"y": 0.2367275506632474,
 		"group": ""
 	},
 	"ap-r1-m5-005": {
 		"id": "ap-r1-m5-005",
-		"x": 0.6023959095038668,
-		"y": 0.25282966606838175,
+		"x": 0.6068367704099491,
+		"y": 0.2367275506632474,
 		"group": ""
 	},
 	"ap-r1-m2-007": {
 		"id": "ap-r1-m2-007",
-		"x": 0.5375909430004358,
-		"y": 0.25282966606838175,
+		"x": 0.5441639939139814,
+		"y": 0.2367275506632474,
 		"group": ""
 	},
 	"ap-r1-m5-007": {
 		"id": "ap-r1-m5-007",
-		"x": 0.5375909430004358,
-		"y": 0.25282966606838175,
+		"x": 0.5441639939139814,
+		"y": 0.2367275506632474,
 		"group": ""
 	},
 	"ap-r1-m2-008": {
 		"id": "ap-r1-m2-008",
-		"x": 0.46058022557557227,
-		"y": 0.25282966606838175,
+		"x": 0.4696870557813605,
+		"y": 0.2367275506632474,
 		"group": ""
 	},
 	"ap-r1-m5-008": {
 		"id": "ap-r1-m5-008",
-		"x": 0.46058022557557227,
-		"y": 0.25282966606838175,
+		"x": 0.4696870557813605,
+		"y": 0.2367275506632474,
 		"group": ""
 	},
 	"ap-r1-m2-001": {
 		"id": "ap-r1-m2-001",
-		"x": 0.7405258628967331,
-		"y": 0.20942446468272438,
+		"x": 0.740422021101055,
+		"y": 0.19475045180830472,
 		"group": ""
 	},
 	"ap-r1-m5-001": {
 		"id": "ap-r1-m5-001",
-		"x": 0.7405258628967331,
-		"y": 0.20942446468272438,
+		"x": 0.740422021101055,
+		"y": 0.19475045180830472,
 		"group": ""
 	},
 	"ap-r1-m2-009": {
 		"id": "ap-r1-m2-009",
-		"x": 0.6738687983336659,
-		"y": 0.33834747797055836,
+		"x": 0.6759580836184667,
+		"y": 0.330300086432893,
 		"group": ""
 	},
 	"ap-r1-m5-009": {
 		"id": "ap-r1-m5-009",
-		"x": 0.6738687983336659,
-		"y": 0.33834747797055836,
+		"x": 0.6759580836184667,
+		"y": 0.330300086432893,
 		"group": ""
 	},
 	"ap-r1-m2-006": {
 		"id": "ap-r1-m2-006",
-		"x": 0.6598294149364414,
-		"y": 0.46867756874736866,
+		"x": 0.6623806190309516,
+		"y": 0.43833048795296903,
 		"group": ""
 	},
 	"ap-r1-m5-006": {
 		"id": "ap-r1-m5-006",
-		"x": 0.6598294149364414,
-		"y": 0.46867756874736866,
+		"x": 0.6623806190309516,
+		"y": 0.43833048795296903,
 		"group": ""
 	},
 	"ap-r3-m2-007": {
 		"id": "ap-r3-m2-007",
-		"x": 0.3932196222680169,
-		"y": 0.23732226875549356,
+		"x": 0.40454272713635686,
+		"y": 0.22173037223289738,
 		"group": ""
 	},
 	"ap-r3-m5-007": {
 		"id": "ap-r3-m5-007",
-		"x": 0.3932196222680169,
-		"y": 0.23732226875549356,
+		"x": 0.40454272713635686,
+		"y": 0.22173037223289738,
 		"group": ""
 	},
 	"ap-r3-m2-003": {
 		"id": "ap-r3-m2-003",
-		"x": 0.3790103554994202,
-		"y": 0.4817992126275048,
+		"x": 0.3908009686198596,
+		"y": 0.45816362246683756,
 		"group": ""
 	},
 	"ap-r3-m5-003": {
 		"id": "ap-r3-m5-003",
-		"x": 0.3790103554994202,
-		"y": 0.4817992126275048,
+		"x": 0.3908009686198596,
+		"y": 0.45816362246683756,
 		"group": ""
 	},
 	"ap-r3-m2-001": {
 		"id": "ap-r3-m2-001",
-		"x": 0.4583108053210427,
-		"y": 0.46867756874736866,
+		"x": 0.46749408899016376,
+		"y": 0.43833048795296903,
 		"group": ""
 	},
 	"ap-r3-m5-001": {
 		"id": "ap-r3-m5-001",
-		"x": 0.4583108053210427,
-		"y": 0.46867756874736866,
+		"x": 0.46749408899016376,
+		"y": 0.43833048795296903,
 		"group": ""
 	},
 	"ap-r3-m2-002": {
 		"id": "ap-r3-m2-002",
-		"x": 0.5450104145892886,
-		"y": 0.46867756874736866,
+		"x": 0.5513393526819198,
+		"y": 0.43833048795296903,
 		"group": ""
 	},
 	"ap-r3-m5-002": {
 		"id": "ap-r3-m5-002",
-		"x": 0.5450104145892886,
-		"y": 0.46867756874736866,
+		"x": 0.5513393526819198,
+		"y": 0.43833048795296903,
 		"group": ""
 	},
 	"ap-r3-m2-008": {
 		"id": "ap-r3-m2-008",
-		"x": 0.3909409692215648,
-		"y": 0.6401452872136912,
+		"x": 0.42005600280014005,
+		"y": 0.6112998507068211,
 		"group": ""
 	},
 	"ap-r3-m5-008": {
 		"id": "ap-r3-m5-008",
-		"x": 0.3909409692215648,
-		"y": 0.6401452872136912,
+		"x": 0.42005600280014005,
+		"y": 0.6112998507068211,
 		"group": ""
 	},
 	"ap-r3-m2-005": {
 		"id": "ap-r3-m2-005",
-		"x": 0.4412707645490335,
-		"y": 0.6401452872136912,
+		"x": 0.463667111927025,
+		"y": 0.6112998507068211,
 		"group": ""
 	},
 	"ap-r3-m5-005": {
 		"id": "ap-r3-m5-005",
-		"x": 0.4412707645490335,
-		"y": 0.6401452872136912,
+		"x": 0.463667111927025,
+		"y": 0.6112998507068211,
 		"group": ""
 	},
 	"ap-r2-m2-002": {
 		"id": "ap-r2-m2-002",
-		"x": 0.33425901305147465,
-		"y": 0.23732226875549356,
+		"x": 0.34752201895809076,
+		"y": 0.22173037223289738,
 		"group": ""
 	},
 	"ap-vi-m2-002": {
 		"id": "ap-vi-m2-002",
-		"x": 0.8266567321825582,
-		"y": 0.27829001307363327,
+		"x": 0.8237190430950119,
+		"y": 0.2613502103676611,
 		"group": ""
 	},
 	"ap-vi-m5-002": {
 		"id": "ap-vi-m5-002",
-		"x": 0.8266567321825582,
-		"y": 0.27829001307363327,
+		"x": 0.8237190430950119,
+		"y": 0.2613502103676611,
 		"group": ""
 	},
 	"ap-vi-m2-003": {
 		"id": "ap-vi-m2-003",
-		"x": 1.0472152053003612,
-		"y": 0.4045835272219636,
+		"x": 0.9610866257598595,
+		"y": 0.40880044002200117,
 		"group": ""
 	},
 	"ap-vi-m2-001": {
 		"id": "ap-vi-m2-001",
-		"x": 0.9221514990360966,
-		"y": 0.2620809235746416,
+		"x": 0.9160718750223226,
+		"y": 0.24567442657847172,
 		"group": ""
 	},
 	"ap-vi-m5-001": {
 		"id": "ap-vi-m5-001",
-		"x": 0.9221514990360966,
-		"y": 0.2620809235746416,
+		"x": 0.9160718750223226,
+		"y": 0.24567442657847172,
 		"group": ""
 	},
 	"ap-vi-m2-020": {
 		"id": "ap-vi-m2-020",
-		"x": 0.7871514621049288,
-		"y": 0.41599895115483754,
+		"x": 0.7918442350688963,
+		"y": 0.4097111998457066,
 		"group": ""
 	},
 	"ap-vi-m5-020": {
 		"id": "ap-vi-m5-020",
-		"x": 0.7871514621049288,
-		"y": 0.41599895115483754,
+		"x": 0.7918442350688963,
+		"y": 0.4097111998457066,
 		"group": ""
 	},
 	"ap-r7-m2-004": {
 		"id": "ap-r7-m2-004",
-		"x": 0.1838752982191791,
-		"y": 0.41673018827509295,
+		"x": 0.2020861757373583,
+		"y": 0.40237869036308965,
 		"group": ""
 	},
 	"ap-r7-m5-004": {
 		"id": "ap-r7-m5-004",
-		"x": 0.1838752982191791,
-		"y": 0.41673018827509295,
+		"x": 0.2020861757373583,
+		"y": 0.40237869036308965,
 		"group": ""
 	},
 	"ap-r7-m2-001": {
 		"id": "ap-r7-m2-001",
-		"x": 0.24755755722484435,
-		"y": 0.41673018827509295,
+		"x": 0.26367318365918296,
+		"y": 0.40237869036308965,
 		"group": ""
 	},
 	"ap-r7-m5-001": {
 		"id": "ap-r7-m5-001",
-		"x": 0.24755755722484435,
-		"y": 0.41673018827509295,
+		"x": 0.26367318365918296,
+		"y": 0.40237869036308965,
 		"group": ""
 	},
 	"ap-r7-m2-005": {
 		"id": "ap-r7-m2-005",
-		"x": 0.1838752982191791,
-		"y": 0.3161887773567624,
+		"x": 0.2020861757373583,
+		"y": 0.2980020429592907,
 		"group": ""
 	},
 	"ap-r7-m5-005": {
 		"id": "ap-r7-m5-005",
-		"x": 0.1838752982191791,
-		"y": 0.3161887773567624,
+		"x": 0.2020861757373583,
+		"y": 0.2980020429592907,
 		"group": ""
 	},
 	"ap-r7-m2-002": {
 		"id": "ap-r7-m2-002",
-		"x": 0.24755755722484435,
-		"y": 0.3161887773567624,
+		"x": 0.26367318365918296,
+		"y": 0.2980020429592907,
 		"group": ""
 	},
 	"ap-r7-m5-002": {
 		"id": "ap-r7-m5-002",
-		"x": 0.24755755722484435,
-		"y": 0.3161887773567624,
+		"x": 0.26367318365918296,
+		"y": 0.2980020429592907,
 		"group": ""
 	},
 	"ap-r7-m2-006": {
 		"id": "ap-r7-m2-006",
-		"x": 0.1838752982191791,
-		"y": 0.21156647240872462,
+		"x": 0.2020861757373583,
+		"y": 0.19682198395634062,
 		"group": ""
 	},
 	"ap-r7-m5-006": {
 		"id": "ap-r7-m5-006",
-		"x": 0.1838752982191791,
-		"y": 0.21156647240872462,
+		"x": 0.2020861757373583,
+		"y": 0.19682198395634062,
 		"group": ""
 	},
 	"ap-r7-m2-003": {
 		"id": "ap-r7-m2-003",
-		"x": 0.24755755722484435,
-		"y": 0.21156647240872462,
+		"x": 0.26367318365918296,
+		"y": 0.19682198395634062,
 		"group": ""
 	},
 	"ap-r7-m5-003": {
 		"id": "ap-r7-m5-003",
-		"x": 0.24755755722484435,
-		"y": 0.21156647240872462,
+		"x": 0.26367318365918296,
+		"y": 0.19682198395634062,
 		"group": ""
 	},
 	"ap-r7-m2-013": {
 		"id": "ap-r7-m2-013",
-		"x": 0.23462426229992542,
-		"y": 0.6106298979961149,
+		"x": 0.25116541541362786,
+		"y": 0.582755566349746,
 		"group": ""
 	},
 	"ap-r7-m5-013": {
 		"id": "ap-r7-m5-013",
-		"x": 0.23462426229992542,
-		"y": 0.6106298979961149,
+		"x": 0.25116541541362786,
+		"y": 0.582755566349746,
 		"group": ""
 	},
 	"ap-r7-m2-014": {
 		"id": "ap-r7-m2-014",
-		"x": 0.18120702135360117,
-		"y": 0.6106298979961149,
+		"x": 0.19950568957019282,
+		"y": 0.582755566349746,
 		"group": ""
 	},
 	"ap-r7-m5-014": {
 		"id": "ap-r7-m5-014",
-		"x": 0.18120702135360117,
-		"y": 0.6106298979961149,
+		"x": 0.19950568957019282,
+		"y": 0.582755566349746,
 		"group": ""
 	},
 	"ap-r7-m2-007": {
 		"id": "ap-r7-m2-007",
-		"x": 0.10711571273460523,
-		"y": 0.41673018827509295,
+		"x": 0.1278521068910588,
+		"y": 0.40237869036308965,
 		"group": ""
 	},
 	"ap-r7-m5-007": {
 		"id": "ap-r7-m5-007",
-		"x": 0.10711571273460523,
-		"y": 0.41673018827509295,
+		"x": 0.1278521068910588,
+		"y": 0.40237869036308965,
 		"group": ""
 	},
 	"ap-r7-m2-008": {
 		"id": "ap-r7-m2-008",
-		"x": 0.10711571273460523,
-		"y": 0.3161887773567624,
+		"x": 0.1278521068910588,
+		"y": 0.2980020429592907,
 		"group": ""
 	},
 	"ap-r7-m5-008": {
 		"id": "ap-r7-m5-008",
-		"x": 0.10711571273460523,
-		"y": 0.3161887773567624,
+		"x": 0.1278521068910588,
+		"y": 0.2980020429592907,
 		"group": ""
 	},
 	"ap-r7-m2-009": {
 		"id": "ap-r7-m2-009",
-		"x": 0.10711571273460523,
-		"y": 0.21156647240872462,
+		"x": 0.1278521068910588,
+		"y": 0.19682198395634062,
 		"group": ""
 	},
 	"ap-r7-m5-009": {
 		"id": "ap-r7-m5-009",
-		"x": 0.10711571273460523,
-		"y": 0.21156647240872462,
+		"x": 0.1278521068910588,
+		"y": 0.19682198395634062,
 		"group": ""
 	},
 	"ap-r7-m2-010": {
 		"id": "ap-r7-m2-010",
-		"x": 0.028400621920863903,
-		"y": 0.41673018827509295,
+		"x": 0.07703706613902124,
+		"y": 0.40237869036308965,
 		"group": ""
 	},
 	"ap-r7-m5-010": {
 		"id": "ap-r7-m5-010",
-		"x": 0.028400621920863903,
-		"y": 0.41673018827509295,
+		"x": 0.07703706613902124,
+		"y": 0.40237869036308965,
 		"group": ""
 	},
 	"ap-r7-m2-011": {
 		"id": "ap-r7-m2-011",
-		"x": 0.028400621920863903,
-		"y": 0.3161887773567624,
+		"x": 0.07703706613902124,
+		"y": 0.2980020429592907,
 		"group": ""
 	},
 	"ap-r7-m5-011": {
 		"id": "ap-r7-m5-011",
-		"x": 0.028400621920863903,
-		"y": 0.3161887773567624,
+		"x": 0.07703706613902124,
+		"y": 0.2980020429592907,
 		"group": ""
 	},
 	"ap-r7-m2-012": {
 		"id": "ap-r7-m2-012",
-		"x": 0.028400621920863903,
-		"y": 0.21156647240872462,
+		"x": 0.07703706613902124,
+		"y": 0.19682198395634062,
 		"group": ""
 	},
 	"ap-r7-m5-012": {
 		"id": "ap-r7-m5-012",
-		"x": 0.028400621920863903,
-		"y": 0.21156647240872462,
+		"x": 0.07703706613902124,
+		"y": 0.19682198395634062,
 		"group": ""
 	},
 	"ap-r7-m2-020": {
 		"id": "ap-r7-m2-020",
-		"x": 0.1450772600028068,
-		"y": 0.3515651428866877,
+		"x": 0.1645646568042688,
+		"y": 0.33221446786625036,
 		"group": ""
 	},
 	"ap-r7-m5-020": {
 		"id": "ap-r7-m5-020",
-		"x": 0.1450772600028068,
-		"y": 0.3515651428866877,
+		"x": 0.1645646568042688,
+		"y": 0.33221446786625036,
 		"group": ""
 	},
 	"ap-r7-m2-021": {
 		"id": "ap-r7-m2-021",
-		"x": 0.1450772600028068,
-		"y": 0.27114383212568416,
+		"x": 0.1645646568042688,
+		"y": 0.254439150528955,
 		"group": ""
 	},
 	"ap-r7-m5-021": {
 		"id": "ap-r7-m5-021",
-		"x": 0.1450772600028068,
-		"y": 0.27114383212568416,
+		"x": 0.1645646568042688,
+		"y": 0.254439150528955,
 		"group": ""
 	},
 	"ap-r2-m5-002": {
 		"id": "ap-r2-m5-002",
-		"x": 0.33425901305147465,
-		"y": 0.23732226875549356,
+		"x": 0.34752201895809076,
+		"y": 0.22173037223289738,
 		"group": ""
 	},
 	"ap-r1-m2-020": {
 		"id": "ap-r1-m2-020",
-		"x": 0.44777434317918263,
-		"y": 0.09455745381757481,
+		"x": 0.45730250798254196,
+		"y": 0.08366275456629972,
 		"group": ""
 	},
 	"ap-r1-m5-020": {
 		"id": "ap-r1-m5-020",
-		"x": 0.44777434317918263,
-		"y": 0.09455745381757481,
+		"x": 0.45730250798254196,
+		"y": 0.08366275456629972,
 		"group": ""
 	},
 	"ap-r1-m2-021": {
 		"id": "ap-r1-m2-021",
-		"x": 0.3696150664391707,
-		"y": 0.09455745381757481,
+		"x": 0.38171480002571556,
+		"y": 0.08366275456629972,
 		"group": ""
 	},
 	"ap-lo-m2-001": {
 		"id": "ap-lo-m2-001",
-		"x": 0.9593374917828154,
-		"y": 0.7615011042419139,
+		"x": 0.9520343874336575,
+		"y": 0.7286628617145142,
 		"group": ""
 	},
 	"ap-lo-m5-001": {
 		"id": "ap-lo-m5-001",
-		"x": 0.9593374917828154,
-		"y": 0.7615011042419139,
+		"x": 0.9520343874336575,
+		"y": 0.7286628617145142,
 		"group": ""
 	},
 	"ap-lo-m2-002": {
 		"id": "ap-lo-m2-002",
-		"x": 0.9581021442235961,
-		"y": 0.696310207036126,
+		"x": 0.9508396848413848,
+		"y": 0.6656168522711849,
 		"group": ""
 	},
 	"ap-lo-m5-002": {
 		"id": "ap-lo-m5-002",
-		"x": 0.9581021442235961,
-		"y": 0.696310207036126,
+		"x": 0.9508396848413848,
+		"y": 0.6656168522711849,
 		"group": ""
 	},
 	"ap-lo-m2-003": {
 		"id": "ap-lo-m2-003",
-		"x": 0.944962034759615,
-		"y": 0.6223149194531232,
+		"x": 0.9381319065953297,
+		"y": 0.5940561313779974,
 		"group": ""
 	},
 	"ap-lo-m5-003": {
 		"id": "ap-lo-m5-003",
-		"x": 0.944962034759615,
-		"y": 0.6223149194531232,
+		"x": 0.9381319065953297,
+		"y": 0.5940561313779974,
 		"group": ""
 	},
 	"ap-r3-m2-004": {
 		"id": "ap-r3-m2-004",
-		"x": 0.5069343807012491,
-		"y": 0.34219939876058997,
+		"x": 0.5145160829470045,
+		"y": 0.330300086432893,
 		"group": ""
 	},
 	"ap-r3-m5-004": {
 		"id": "ap-r3-m5-004",
-		"x": 0.5069343807012491,
-		"y": 0.34219939876058997,
+		"x": 0.5145160829470045,
+		"y": 0.330300086432893,
 		"group": ""
 	},
 	"ap-r4-m2-005": {
 		"id": "ap-r4-m2-005",
-		"x": 0.7594143086116097,
-		"y": 0.9424453603374031,
+		"x": 0.7841742087104355,
+		"y": 0.9445200831470145,
 		"group": ""
 	},
 	"ap-r4-m5-005": {
 		"id": "ap-r4-m5-005",
-		"x": 0.7594143086116097,
-		"y": 0.9424453603374031,
+		"x": 0.7841742087104355,
+		"y": 0.9445200831470145,
 		"group": ""
 	},
 	"ap-noc-test": {
 		"id": "ap-noc-test",
-		"x": 0.286857859321796,
-		"y": 0.2784081928102403,
+		"x": 0.3016804411649154,
+		"y": 0.2614645017965184,
 		"group": ""
 	}
 }
\ No newline at end of file
diff --git a/clients/anim/data.js b/clients/anim/data.js
index 9a2c1e7..e3174ca 100644
--- a/clients/anim/data.js
+++ b/clients/anim/data.js
@@ -399,268 +399,268 @@ var data = {
 	],
 	"points": [
 		{
-			"x": 0.6729122810905036,
-			"y": 0.9095618486265299,
+			"x": 0.6407456087090069,
+			"y": 0.9127220646746622,
 			"room": ""
 		},
 		{
-			"x": 0.5765422455627202,
-			"y": 0.9095618486265299,
+			"x": 0.5842624274070847,
+			"y": 0.9127220646746622,
 			"room": ""
 		},
 		{
-			"x": 0.38073873414729625,
-			"y": 0.9058687318575639,
+			"x": 0.3708446136592544,
+			"y": 0.909150457522876,
 			"room": ""
 		},
 		{
-			"x": 0.4449638813179995,
-			"y": 0.9058687318575639,
+			"x": 0.4367532662347403,
+			"y": 0.909150457522876,
 			"room": ""
 		},
 		{
-			"x": 0.5915953895130256,
-			"y": 0.6401452872136912,
+			"x": 0.5963916052945505,
+			"y": 0.6112998507068211,
 			"room": ""
 		},
 		{
-			"x": 0.6376411693884938,
-			"y": 0.6401452872136912,
+			"x": 0.6409224032630203,
+			"y": 0.6112998507068211,
 			"room": ""
 		},
 		{
-			"x": 0.7644461802093258,
-			"y": 0.6659712527790704,
+			"x": 0.763555320623174,
+			"y": 0.6362796711264135,
 			"room": ""
 		},
 		{
-			"x": 0.8269706471079202,
-			"y": 0.6659712527790704,
+			"x": 0.8240226297029136,
+			"y": 0.6362796711264135,
 			"room": ""
 		},
 		{
-			"x": 0.8110145361076027,
-			"y": 0.517323302828189,
+			"x": 0.8085915010036215,
+			"y": 0.49252248326702047,
 			"room": ""
 		},
 		{
-			"x": 0.5901920051408185,
-			"y": 0.09982383833012029,
+			"x": 0.6393330380804755,
+			"y": 0.11659654411291992,
 			"room": ""
 		},
 		{
-			"x": 0.4071500587205566,
-			"y": 0.09455745381757481,
+			"x": 0.4180148293128942,
+			"y": 0.08366275456629972,
 			"room": ""
 		},
 		{
-			"x": 0.48646528100925496,
-			"y": 0.09455745381757481,
+			"x": 0.49472045030822975,
+			"y": 0.08366275456629972,
 			"room": ""
 		},
 		{
-			"x": 0.6023959095038668,
-			"y": 0.25282966606838175,
+			"x": 0.6068367704099491,
+			"y": 0.2367275506632474,
 			"room": ""
 		},
 		{
-			"x": 0.5375909430004358,
-			"y": 0.25282966606838175,
+			"x": 0.5441639939139814,
+			"y": 0.2367275506632474,
 			"room": ""
 		},
 		{
-			"x": 0.46058022557557227,
-			"y": 0.25282966606838175,
+			"x": 0.4696870557813605,
+			"y": 0.2367275506632474,
 			"room": ""
 		},
 		{
-			"x": 0.7405258628967331,
-			"y": 0.20942446468272438,
+			"x": 0.740422021101055,
+			"y": 0.19475045180830472,
 			"room": ""
 		},
 		{
-			"x": 0.6738687983336659,
-			"y": 0.33834747797055836,
+			"x": 0.6759580836184667,
+			"y": 0.330300086432893,
 			"room": ""
 		},
 		{
-			"x": 0.6598294149364414,
-			"y": 0.46867756874736866,
+			"x": 0.6623806190309516,
+			"y": 0.43833048795296903,
 			"room": ""
 		},
 		{
-			"x": 0.3932196222680169,
-			"y": 0.23732226875549356,
+			"x": 0.40454272713635686,
+			"y": 0.22173037223289738,
 			"room": ""
 		},
 		{
-			"x": 0.3790103554994202,
-			"y": 0.4817992126275048,
+			"x": 0.3908009686198596,
+			"y": 0.45816362246683756,
 			"room": ""
 		},
 		{
-			"x": 0.4583108053210427,
-			"y": 0.46867756874736866,
+			"x": 0.46749408899016376,
+			"y": 0.43833048795296903,
 			"room": ""
 		},
 		{
-			"x": 0.5450104145892886,
-			"y": 0.46867756874736866,
+			"x": 0.5513393526819198,
+			"y": 0.43833048795296903,
 			"room": ""
 		},
 		{
-			"x": 0.3909409692215648,
-			"y": 0.6401452872136912,
+			"x": 0.42005600280014005,
+			"y": 0.6112998507068211,
 			"room": ""
 		},
 		{
-			"x": 0.4412707645490335,
-			"y": 0.6401452872136912,
+			"x": 0.463667111927025,
+			"y": 0.6112998507068211,
 			"room": ""
 		},
 		{
-			"x": 0.33425901305147465,
-			"y": 0.23732226875549356,
+			"x": 0.34752201895809076,
+			"y": 0.22173037223289738,
 			"room": ""
 		},
 		{
-			"x": 0.8266567321825582,
-			"y": 0.27829001307363327,
+			"x": 0.8237190430950119,
+			"y": 0.2613502103676611,
 			"room": ""
 		},
 		{
-			"x": 1.0472152053003612,
-			"y": 0.4045835272219636,
+			"x": 0.9610866257598595,
+			"y": 0.40880044002200117,
 			"room": ""
 		},
 		{
-			"x": 0.9221514990360966,
-			"y": 0.2620809235746416,
+			"x": 0.9160718750223226,
+			"y": 0.24567442657847172,
 			"room": ""
 		},
 		{
-			"x": 0.7871514621049288,
-			"y": 0.41599895115483754,
+			"x": 0.7918442350688963,
+			"y": 0.4097111998457066,
 			"room": ""
 		},
 		{
-			"x": 0.1838752982191791,
-			"y": 0.41673018827509295,
+			"x": 0.2020861757373583,
+			"y": 0.40237869036308965,
 			"room": ""
 		},
 		{
-			"x": 0.24755755722484435,
-			"y": 0.41673018827509295,
+			"x": 0.26367318365918296,
+			"y": 0.40237869036308965,
 			"room": ""
 		},
 		{
-			"x": 0.1838752982191791,
-			"y": 0.3161887773567624,
+			"x": 0.2020861757373583,
+			"y": 0.2980020429592907,
 			"room": ""
 		},
 		{
-			"x": 0.24755755722484435,
-			"y": 0.3161887773567624,
+			"x": 0.26367318365918296,
+			"y": 0.2980020429592907,
 			"room": ""
 		},
 		{
-			"x": 0.1838752982191791,
-			"y": 0.21156647240872462,
+			"x": 0.2020861757373583,
+			"y": 0.19682198395634062,
 			"room": ""
 		},
 		{
-			"x": 0.24755755722484435,
-			"y": 0.21156647240872462,
+			"x": 0.26367318365918296,
+			"y": 0.19682198395634062,
 			"room": ""
 		},
 		{
-			"x": 0.23462426229992542,
-			"y": 0.6106298979961149,
+			"x": 0.25116541541362786,
+			"y": 0.582755566349746,
 			"room": ""
 		},
 		{
-			"x": 0.18120702135360117,
-			"y": 0.6106298979961149,
+			"x": 0.19950568957019282,
+			"y": 0.582755566349746,
 			"room": ""
 		},
 		{
-			"x": 0.10711571273460523,
-			"y": 0.41673018827509295,
+			"x": 0.1278521068910588,
+			"y": 0.40237869036308965,
 			"room": ""
 		},
 		{
-			"x": 0.10711571273460523,
-			"y": 0.3161887773567624,
+			"x": 0.1278521068910588,
+			"y": 0.2980020429592907,
 			"room": ""
 		},
 		{
-			"x": 0.10711571273460523,
-			"y": 0.21156647240872462,
+			"x": 0.1278521068910588,
+			"y": 0.19682198395634062,
 			"room": ""
 		},
 		{
-			"x": 0.028400621920863903,
-			"y": 0.41673018827509295,
+			"x": 0.07703706613902124,
+			"y": 0.40237869036308965,
 			"room": ""
 		},
 		{
-			"x": 0.028400621920863903,
-			"y": 0.3161887773567624,
+			"x": 0.07703706613902124,
+			"y": 0.2980020429592907,
 			"room": ""
 		},
 		{
-			"x": 0.028400621920863903,
-			"y": 0.21156647240872462,
+			"x": 0.07703706613902124,
+			"y": 0.19682198395634062,
 			"room": ""
 		},
 		{
-			"x": 0.1450772600028068,
-			"y": 0.3515651428866877,
+			"x": 0.1645646568042688,
+			"y": 0.33221446786625036,
 			"room": ""
 		},
 		{
-			"x": 0.1450772600028068,
-			"y": 0.27114383212568416,
+			"x": 0.1645646568042688,
+			"y": 0.254439150528955,
 			"room": ""
 		},
 		{
-			"x": 0.44777434317918263,
-			"y": 0.09455745381757481,
+			"x": 0.45730250798254196,
+			"y": 0.08366275456629972,
 			"room": ""
 		},
 		{
-			"x": 0.3696150664391707,
-			"y": 0.09455745381757481,
+			"x": 0.38171480002571556,
+			"y": 0.08366275456629972,
 			"room": ""
 		},
 		{
-			"x": 0.9593374917828154,
-			"y": 0.7615011042419139,
+			"x": 0.9520343874336575,
+			"y": 0.7286628617145142,
 			"room": ""
 		},
 		{
-			"x": 0.9581021442235961,
-			"y": 0.696310207036126,
+			"x": 0.9508396848413848,
+			"y": 0.6656168522711849,
 			"room": ""
 		},
 		{
-			"x": 0.944962034759615,
-			"y": 0.6223149194531232,
+			"x": 0.9381319065953297,
+			"y": 0.5940561313779974,
 			"room": ""
 		},
 		{
-			"x": 0.5069343807012491,
-			"y": 0.34219939876058997,
+			"x": 0.5145160829470045,
+			"y": 0.330300086432893,
 			"room": ""
 		},
 		{
-			"x": 0.7594143086116097,
-			"y": 0.9424453603374031,
+			"x": 0.7841742087104355,
+			"y": 0.9445200831470145,
 			"room": ""
 		},
 		{
-			"x": 0.286857859321796,
-			"y": 0.2784081928102403,
+			"x": 0.3016804411649154,
+			"y": 0.2614645017965184,
 			"room": ""
 		}
 	],
diff --git a/clients/anim/index.html b/clients/anim/index.html
index 206e430..5c7c5dc 100644
--- a/clients/anim/index.html
+++ b/clients/anim/index.html
@@ -30,10 +30,10 @@
 				left: 0;
 			}
 			.label {
-				color: #00a0cc;
+				color: #296780;
 				font-size: 11px;
 				width: 140px;
-				height: 38px;
+				height: 24px;
 				padding: 3px;
 				overflow: hidden;
 				word-wrap: break-word;
@@ -123,18 +123,20 @@
 			<div id="container">
 				<img id="map" src="map.png" width="980" height="490">
 				<canvas id="canvas" width="980" height="490"></canvas>
-				<div class="label"      style="left: 33px;top:215px" id="stage1"></div>
-				<div class="label"      style="left:490px;top: 30px" id="stage2"></div>
-				<div class="label"      style="left:150px;top:330px" id="stage3"></div>
-				<div class="label"      style="left:340px;top:342px" id="stage4"></div>
-				<div class="label"      style="left:550px;top:342px" id="stage5"></div>
-				<div class="label"      style="left:740px;top:342px" id="stage6"></div>
-				<div class="label"      style="left:780px;top:440px" id="stage7"></div>
+				<div class="label" style="left:110px;top:225px;width:160px" id="stage1"></div>
+				<div class="label" style="left:506px;top: 20px;width:90px;height:50px" id="stage2"></div>
+				<div class="label" style="left:160px;top:342px" id="stage3"></div>
+				<div class="label" style="left:370px;top:342px" id="stage4"></div>
+				<div class="label" style="left:540px;top:342px" id="stage5"></div>
+				<div class="label" style="left:710px;top:342px" id="stage6"></div>
+				<div class="label" style="left:710px;top:410px" id="stage7"></div>
+				<!--
 				<div class="label grey" style="left:320px;top:140px">Cafeteria</div>
 				<div class="label grey" style="left:850px;top:220px">Hof</div>
 				<div class="label grey" style="left:920px;top:320px">VIP</div>
 				<div class="label grey" style="left:480px;top:410px">Workshops</div>
 				<div class="label grey" style="left:570px;top:170px">Foyer</div>
+				-->
 			</div>
 			<div id="timer"></div>
 			<div id="slider">
diff --git a/clients/anim/map.png b/clients/anim/map.png
index 0a34f68..1fd1b10 100644
Binary files a/clients/anim/map.png and b/clients/anim/map.png differ
diff --git a/node.js/2 convert svg.js b/node.js/2 convert svg.js
index e0eb131..31d5b59 100644
--- a/node.js/2 convert svg.js	
+++ b/node.js/2 convert svg.js	
@@ -1,4 +1,4 @@
-var svg = '../sources/access points_wtf2d.svg';
+var svg = '../sources/access points_redrawn-0.1.0-convert.svg';
 
 var fs = require('fs');