Clean up xmonad config, other misc changes.