diff --git a/src/yggdrasil/core.go b/src/yggdrasil/core.go
index 4dcd16f..884ef9e 100644
--- a/src/yggdrasil/core.go
+++ b/src/yggdrasil/core.go
@@ -91,21 +91,17 @@ func (c *Core) _addPeerLoop() {
 
 	// Add peers from the Peers section
 	for _, peer := range current.Peers {
-		go func() {
-			if err := c.AddPeer(peer, ""); err != nil {
-				c.log.Errorln("Failed to add peer:", err)
-			}
-		}() // TODO: this should be acted and not in a goroutine?
+		if err := c.AddPeer(peer, ""); err != nil {
+			c.log.Errorln("Failed to add peer:", err)
+		}
 	}
 
 	// Add peers from the InterfacePeers section
 	for intf, intfpeers := range current.InterfacePeers {
 		for _, peer := range intfpeers {
-			go func() {
-				if err := c.AddPeer(peer, intf); err != nil {
-					c.log.Errorln("Failed to add peer:", err)
-				}
-			}() // TODO: this should be acted and not in a goroutine?
+			if err := c.AddPeer(peer, intf); err != nil {
+				c.log.Errorln("Failed to add peer:", err)
+			}
 		}
 	}
 
diff --git a/src/yggdrasil/link.go b/src/yggdrasil/link.go
index bdf1554..3686ab9 100644
--- a/src/yggdrasil/link.go
+++ b/src/yggdrasil/link.go
@@ -86,7 +86,7 @@ func (l *link) reconfigure() {
 func (l *link) call(uri string, sintf string) error {
 	u, err := url.Parse(uri)
 	if err != nil {
-		return fmt.Errorf("peer %s is not correctly formatted (%s)", uri, err)
+		return fmt.Errorf("peer %s is not correctly formatted", uri)
 	}
 	pathtokens := strings.Split(strings.Trim(u.Path, "/"), "/")
 	switch u.Scheme {
diff --git a/src/yggdrasil/tcp.go b/src/yggdrasil/tcp.go
index 93e39e4..f81e49a 100644
--- a/src/yggdrasil/tcp.go
+++ b/src/yggdrasil/tcp.go
@@ -266,6 +266,7 @@ func (t *tcp) call(saddr string, options interface{}, sintf string) {
 			}
 			dialer := net.Dialer{
 				Control: t.tcpContext,
+				Timeout: time.Second * 5,
 			}
 			if sintf != "" {
 				ief, err := net.InterfaceByName(sintf)