diff --git a/lib/network/locales.js b/lib/network/locales.js
index f29653de..2e3303b7 100644
--- a/lib/network/locales.js
+++ b/lib/network/locales.js
@@ -1,14 +1,14 @@
 // English
 exports['en'] = {
-  add: 'Add Node',
   edit: 'Edit',
-  link: 'Add Link',
   del: 'Delete selected',
+  back: 'Back',
+  addNode: 'Add Node',
+  addEdge: 'Add Edge',
   editNode: 'Edit Node',
   editEdge: 'Edit Edge',
-  back: 'Back',
   addDescription: 'Click in an empty space to place a new node.',
-  linkDescription: 'Click on a node and drag the edge to another node to connect them.',
+  edgeDescription: 'Click on a node and drag the edge to another node to connect them.',
   editEdgeDescription: 'Click on the control points and drag them to a node to connect to it.',
   createEdgeError: 'Cannot link edges to a cluster.',
   deleteClusterError: 'Clusters cannot be deleted.'
@@ -18,15 +18,15 @@ exports['en_US'] = exports['en'];
 
 // Dutch
 exports['nl'] = {
-  add: 'Node',
   edit: 'Wijzigen',
-  link: 'Link toevoegen',
   del: 'Selectie verwijderen',
+  back: 'Terug',
+  addNode: 'Node toevoegen',
+  addEdge: 'Link toevoegen',
   editNode: 'Node wijzigen',
   editEdge: 'Link wijzigen',
-  back: 'Terug',
   addDescription: 'Klik op een leeg gebied om een nieuwe node te maken.',
-  linkDescription: 'Klik op een node en sleep de link naar een andere node om ze te verbinden.',
+  edgeDescription: 'Klik op een node en sleep de link naar een andere node om ze te verbinden.',
   editEdgeDescription: 'Klik op de verbindingspunten en sleep ze naar een node om daarmee te verbinden.',
   createEdgeError: 'Kan geen link maken naar een cluster.',
   deleteClusterError: 'Clusters kunnen niet worden verwijderd.'
diff --git a/lib/network/mixins/ManipulationMixin.js b/lib/network/mixins/ManipulationMixin.js
index 5d12bc50..54e0498d 100644
--- a/lib/network/mixins/ManipulationMixin.js
+++ b/lib/network/mixins/ManipulationMixin.js
@@ -91,10 +91,10 @@ exports._createManipulatorBar = function() {
     // add the icons to the manipulator div
     this.manipulationDiv.innerHTML = "" +
       "<span class='network-manipulationUI add' id='network-manipulate-addNode'>" +
-        "<span class='network-manipulationLabel'>"+locale['add'] +"</span></span>" +
+        "<span class='network-manipulationLabel'>"+locale['addNode'] +"</span></span>" +
       "<div class='network-seperatorLine'></div>" +
       "<span class='network-manipulationUI connect' id='network-manipulate-connectNode'>" +
-        "<span class='network-manipulationLabel'>"+locale['link'] +"</span></span>";
+        "<span class='network-manipulationLabel'>"+locale['addEdge'] +"</span></span>";
     if (this._getSelectedNodeCount() == 1 && this.triggerFunctions.edit) {
       this.manipulationDiv.innerHTML += "" +
         "<div class='network-seperatorLine'></div>" +
@@ -207,7 +207,7 @@ exports._createAddEdgeToolbar = function() {
       "<span class='network-manipulationLabel'>" + locale['back'] + " </span></span>" +
     "<div class='network-seperatorLine'></div>" +
     "<span class='network-manipulationUI none' id='network-manipulate-back'>" +
-      "<span id='network-manipulatorLabel' class='network-manipulationLabel'>" + locale['linkDescription'] + "</span></span>";
+      "<span id='network-manipulatorLabel' class='network-manipulationLabel'>" + locale['edgeDescription'] + "</span></span>";
 
   // bind the icon
   var backButton = document.getElementById("network-manipulate-back");
diff --git a/lib/shared/Activator.js b/lib/shared/Activator.js
index f7a4feb1..fd1e6777 100644
--- a/lib/shared/Activator.js
+++ b/lib/shared/Activator.js
@@ -73,6 +73,7 @@ Activator.prototype.destroy = function () {
   // cleanup hammer instances
   this.hammer = null;
   this.windowHammer = null;
+  // FIXME: cleaning up hammer instances doesn't work (Timeline not removed from memory)
 };
 
 /**
diff --git a/test/timeline.html b/test/timeline.html
index 556eeda2..b4f3d9d2 100644
--- a/test/timeline.html
+++ b/test/timeline.html
@@ -96,7 +96,8 @@
     //min: moment('2013-01-01'),
     //max: moment('2013-12-31'),
     //zoomMin: 1000 * 60 * 60 * 24,            // 1 day
-    zoomMax: 1000 * 60 * 60 * 24 * 30 * 6    // 6 months
+    zoomMax: 1000 * 60 * 60 * 24 * 30 * 6,    // 6 months
+    clickToUse: true
   };
 
   console.timeEnd('create dataset');