diff --git a/bindings.lua b/bindings.lua
index 9ba133e..882c93a 100644
--- a/bindings.lua
+++ b/bindings.lua
@@ -36,12 +36,15 @@ bindings.spawnf = spawnf
 conf.cmd.run = conf.cmd.run or spawnf("dmenu_run")
 
 local function mpdserver(host)
-	return function() mpd.set_server(host, "6600") end
+	return function()
+		mpd.set_server(host, "6600")
+		awful.util.spawn("mpd-host set " .. host .. " 6600")
+	end
 end
 
 mpdhosts = {
-	n = { func = mpdserver("nas.local"), desc = "NAS" },
-	b = { func = mpdserver("berryhorst.local"), desc = "Berry" },
+	n = { func = mpdserver("nas"), desc = "NAS" },
+	b = { func = mpdserver("berryhorst"), desc = "Berry" },
 	l = { func = mpdserver("127.0.0.1"), desc = "Local" }
 }
 
diff --git a/calendar.lua b/calendar.lua
index 80d1eb9..102255e 100644
--- a/calendar.lua
+++ b/calendar.lua
@@ -1,7 +1,6 @@
 local beautiful = require("beautiful")
 local wibox = require("wibox")
 local conf = conf
-local modkey = conf.modkey or "Mod4"
 local mb = require("modalbind")
 local awful = require("awful")
 
diff --git a/layouts.lua b/layouts.lua
index 363139e..0297cde 100644
--- a/layouts.lua
+++ b/layouts.lua
@@ -1,6 +1,5 @@
 local awful = require("awful")
 local conf = conf
-local modkey = conf.modkey or "Mod4"
 
 local layouts={ mt={} }
 local list = {
diff --git a/tags.lua b/tags.lua
index 0f41338..7325f00 100644
--- a/tags.lua
+++ b/tags.lua
@@ -43,7 +43,7 @@ end
 local defaultsetup = {
     {"1:⚙"},
     { name = "2:⌘",   layout = layouts[5]  },
-    { name = "3:☻",   layout = layouts[3], mwfact = 0.20, ncol = 2, nmaster = 2},
+    { name = "3:☻",   layout = layouts[3], mwfact = 0.20, ncol = 2, nmaster = 1},
     { name = "4:✉",   layout = layouts[5]  },
     {"5:☑"},
     {"6:♫"},