Fix modkey on xmonad, and some other minor updates