diff --git a/.travis.yml b/.travis.yml
index 3fd7103..73a4b6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 os:
-    - linux
-    - osx
+  - linux
+  - osx
 
 language: go
 
@@ -9,12 +9,16 @@ go:
 
 install: true
 
+before_install:
+  - make deps
+
 script:
-    - make deps
-    - gx-go rewrite
-    - go get github.com/mattn/goveralls
-    - goveralls -service=travis-ci
+  - go vet
+  - $GOPATH/bin/goveralls -service="travis-ci"
 
 cache:
     directories:
         - $GOPATH/src/gx
+
+notifications:
+  email: false
diff --git a/Makefile b/Makefile
index 7c146b1..1865d9c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,17 @@
-test: deps
-	go test -race -v ./...
-
 export IPFS_API ?= v04x.ipfs.io
 
 gx:
-	go get -u github.com/whyrusleeping/gx
-	go get -u github.com/whyrusleeping/gx-go
+	go get github.com/whyrusleeping/gx
+	go get github.com/whyrusleeping/gx-go
 
-deps: gx
+covertools:
+	go get github.com/mattn/goveralls
+	go get golang.org/x/tools/cmd/cover
+
+deps: gx covertools
 	gx --verbose install --global
 	gx-go rewrite
-	go get -t ./...
+
+publish:
+	gx-go rewrite --undo
 
diff --git a/addr_manager_test.go b/addr_manager_test.go
index a480ee7..04a2a97 100644
--- a/addr_manager_test.go
+++ b/addr_manager_test.go
@@ -40,7 +40,7 @@ func testHas(t *testing.T, exp, act []ma.Multiaddr) {
 		}
 
 		if !found {
-			t.Fatal("expected address %s not found", a)
+			t.Fatalf("expected address %s not found", a)
 		}
 	}
 }
diff --git a/metrics.go b/metrics.go
index 2045ed9..94b0acc 100644
--- a/metrics.go
+++ b/metrics.go
@@ -29,7 +29,7 @@ type metrics struct {
 	latmu  sync.RWMutex
 }
 
-func NewMetrics() Metrics {
+func NewMetrics() *metrics {
 	return &metrics{
 		latmap: make(map[peer.ID]time.Duration),
 	}
diff --git a/peerstore.go b/peerstore.go
index c87c7c1..e26c0ad 100644
--- a/peerstore.go
+++ b/peerstore.go
@@ -163,8 +163,8 @@ func (kb *keybook) AddPrivKey(p peer.ID, sk ic.PrivKey) error {
 }
 
 type peerstore struct {
-	keybook
-	metrics
+	*keybook
+	*metrics
 	AddrManager
 
 	// store other data, like versions
@@ -180,8 +180,8 @@ type peerstore struct {
 // NewPeerstore creates a threadsafe collection of peers.
 func NewPeerstore() Peerstore {
 	return &peerstore{
-		keybook:     *newKeybook(),
-		metrics:     *(NewMetrics()).(*metrics),
+		keybook:     newKeybook(),
+		metrics:     NewMetrics(),
 		AddrManager: AddrManager{},
 		//ds:          dssync.MutexWrap(ds.NewMapDatastore()),
 		ds: make(map[string]interface{}),