diff --git a/.gitignore b/.gitignore
index 123ae94d..e4c5b0e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,14 @@
+**/node_modules/
+**/*.log
+test/repo-tests*
+**/bundle.js
+
 # Logs
 logs
 *.log
 
+coverage
+
 # Runtime data
 pids
 *.pid
@@ -19,9 +26,17 @@ coverage
 # node-waf configuration
 .lock-wscript
 
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
+build
 
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
+
+lib
+dist
+test/test-data/go-ipfs-repo/LOCK
+test/test-data/go-ipfs-repo/LOG
+test/test-data/go-ipfs-repo/LOG.old
+
+# while testing npm5
+package-lock.json
diff --git a/.travis.yml b/.travis.yml
index 9d678dd1..584f308f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,22 +3,16 @@ language: node_js
 
 matrix:
   include:
-  - node_js: 4
-    env: CXX=g++-4.8
   - node_js: 6
-    env:
-      - SAUCE=true
-      - CXX=g++-4.8
-  - node_js: stable
     env: CXX=g++-4.8
-
-# Make sure we have new NPM.
-before_install:
-  - npm install -g npm
+  - node_js: 8
+    env: CXX=g++-4.8
+    #  - node_js: stable
+    #    env: CXX=g++-4.8
 
 script:
   - npm run lint
-  - npm test
+  - npm run test
   - npm run coverage
   - make test
 
diff --git a/README.md b/README.md
index 0ee970dd..68990782 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
 [![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)
 ![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square)
-![](https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square)
+![](https://img.shields.io/badge/Node.js-%3E%3D6.0.0-orange.svg?style=flat-square)
 
 > JavaScript implementation of the Kademlia DHT for libp2p, based on [go-libp2p-kad-dht](https://github.com/libp2p/go-libp2p-kad-dht).
 
diff --git a/circle.yml b/circle.yml
index 5a84b052..56f7efbe 100644
--- a/circle.yml
+++ b/circle.yml
@@ -5,13 +5,10 @@ machine:
 dependencies:
   pre:
     - google-chrome --version
-    - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-    - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+    - curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+    - sudo dpkg -i google-chrome.deb || true
     - sudo apt-get update
-    - sudo apt-get --only-upgrade install google-chrome-stable
+    - sudo apt-get install -f
+    - sudo apt-get install --only-upgrade lsb-base
+    - sudo dpkg -i google-chrome.deb
     - google-chrome --version
-
-test:
-  override:
-    - npm run test
-    - npm run test:interop
diff --git a/package.json b/package.json
index 6153410d..75dbf3ff 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "url": "https://github.com/libp2p/js-libp2p-kad-dht/issues"
   },
   "engines": {
-    "node": ">=4.0.0",
+    "node": ">=6.0.0",
     "npm": ">=3.0.0"
   },
   "homepage": "https://github.com/libp2p/js-libp2p-kad-dht",
@@ -44,16 +44,16 @@
     "async": "^2.5.0",
     "base32.js": "^0.1.0",
     "cids": "~0.5.1",
-    "debug": "^2.6.8",
+    "debug": "^3.0.1",
     "hashlru": "^2.2.0",
     "heap": "^0.2.6",
     "interface-datastore": "^0.3.0",
-    "k-bucket": "^3.2.1",
-    "libp2p-crypto": "~0.9.4",
-    "libp2p-record": "~0.4.0",
+    "k-bucket": "^3.3.0",
+    "libp2p-crypto": "~0.10.0",
+    "libp2p-record": "~0.5.0",
     "multihashing-async": "~0.4.6",
-    "peer-id": "~0.9.0",
-    "peer-info": "~0.10.0",
+    "peer-id": "~0.10.0",
+    "peer-info": "~0.11.0",
     "priorityqueue": "^0.2.0",
     "protocol-buffers": "^3.2.1",
     "pull-length-prefixed": "^1.3.0",
@@ -64,13 +64,13 @@
   },
   "devDependencies": {
     "aegir": "^11.0.2",
-    "chai": "^4.1.0",
-    "datastore-level": "^0.5.0",
+    "chai": "^4.1.2",
+    "datastore-level": "^0.6.0",
     "dirty-chai": "^2.0.1",
     "interface-connection": "~0.3.2",
-    "libp2p-multiplex": "~0.4.4",
-    "libp2p-swarm": "~0.31.0",
-    "libp2p-tcp": "~0.10.2",
+    "libp2p-multiplex": "~0.5.0",
+    "libp2p-swarm": "~0.32.0",
+    "libp2p-tcp": "~0.11.0",
     "lodash": "^4.17.4",
     "lodash.random": "^3.2.0",
     "lodash.range": "^3.2.0",
@@ -83,4 +83,4 @@
     "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
     "Pedro Teixeira <i@pgte.me>"
   ]
-}
\ No newline at end of file
+}