Xmonad + dzen2 and some long overdue cleanup