diff --git a/rc.lua b/rc.lua
index 59fb6eb..5fc587f 100644
--- a/rc.lua
+++ b/rc.lua
@@ -2,7 +2,6 @@
 awful           = require("awful")
 awful.rules     = require("awful.rules")
                   require("awful.autofocus")
-wibox           = require("wibox")
 beautiful       = require("autobeautiful")
 naughty         = require("naughty")
 conf            = require("localconf")
@@ -35,7 +34,6 @@ for s = 1, screen.count() do
 	local lbottom = widgets.layout(s,"left","bottom")
 	local rbottom = widgets.layout(s,"right","bottom")
 
-	-- {{{
 	widgets.add.clock("clock", s, ltop)
 
 	widgets.add.layout(s, lbottom)
@@ -59,8 +57,6 @@ for s = 1, screen.count() do
 end
 -- }}}
 
-calendar = require("calendar")
-
 -- {{{ Key bindings
 globalkeys = {}
 globalkeys = layouts.extend_key_table(globalkeys);
@@ -80,7 +76,6 @@ rules.setup()
 
 require("signals")
 
---cal:calculate_size()
 --
 -- vim: fdm=marker
 --
diff --git a/rules.lua b/rules.lua
index 8240993..7e3cb96 100644
--- a/rules.lua
+++ b/rules.lua
@@ -25,13 +25,13 @@ local function setup(self)
 			properties = {
 				border_width = beautiful.border_width,
 				border_color = beautiful.border_normal,
-				focus = true,
-				size_hints_honor = false,
+				focus = awful.client.focus.filter,
+				raise = true,
 				keys = clientkeys,
 				minimized = false,
-				--skip_taskbar = true,
 				buttons = clientbuttons 
 			},
+			-- print name and class of new windows for debugging purposes
 			callback = function(c)
 				if(c["name"] ~= nil and c["class"] ~= nil) then
 					print("-----------\nnew client\n")