improved xmonad.hs