xmonad.hs updates (though those really happened in a previous commit)