diff --git a/Xresources b/Xresources
index c7e707d..be3f527 100644
--- a/Xresources
+++ b/Xresources
@@ -34,6 +34,8 @@ XTerm*color13: #AD7FA8
 XTerm*color14: #34E2E2
 XTerm*color15: #EEEEEC
 
+XTerm*toolBar: false
+
 /* UXTerm */
 UXTerm*faceSize: 9
 UXTerm*faceName: Monospace
@@ -64,6 +66,8 @@ UXTerm*color13: #AD7FA8
 UXTerm*color14: #34E2E2
 UXTerm*color15: #EEEEEC
 
+UXTerm*toolBar: false
+
 /* URxvt */
 URxvt*font: xft:Monospace-9
 
diff --git a/gdbinit b/gdbinit
new file mode 100644
index 0000000..ed121fc
--- /dev/null
+++ b/gdbinit
@@ -0,0 +1,9 @@
+set confirm off
+set history save on
+set verbose off
+
+set output-radix 0x10
+set input-radix 0x10
+
+set height 0
+set width 0
diff --git a/install.pl b/install.pl
index 2d972a0..a2cba59 100755
--- a/install.pl
+++ b/install.pl
@@ -81,6 +81,8 @@ my %links = (
 	'git-untrack-ignored' => 'bin/git-untracked-ignored',
 
 	latex => '.latex',
+
+	gdbinit => '.gdbinit',
 );
 
 my $i = 0; # Keep track of how many links we added
diff --git a/xmonad.hs b/xmonad.hs
index 9728b01..770f44f 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -1,9 +1,13 @@
 import XMonad
 import qualified XMonad.StackSet as W
 
+import XMonad.Actions.CycleWS
+
 import XMonad.Layout.Grid
+import XMonad.Layout.Tabbed
 import XMonad.Layout.NoBorders(smartBorders)
 
+import XMonad.Hooks.UrgencyHook
 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.ManageDocks
 
@@ -17,7 +21,12 @@ import XMonad.Prompt.Window
 
 import System.IO(hPutStrLn)
 
-myLayoutHook = tiled ||| Mirror tiled ||| Grid ||| Full
+-- Things that should always float
+myFloatHook = composeAll [
+	className =? "qemu" --> doFloat
+	]
+
+myLayoutHook = tiled ||| Mirror tiled ||| Grid ||| simpleTabbed
 	where
 		-- default tiling algorithm partitions the screen into two panes
 		tiled   = Tall nmaster delta ratio
@@ -34,10 +43,11 @@ myLayoutHook = tiled ||| Mirror tiled ||| Grid ||| Full
 main = do
 	xmproc <- spawnPipe "xmobar"
 	xmonad $ defaultConfig
-			{ manageHook = manageDocks <+> manageHook defaultConfig <+> scratchpadManageHook (W.RationalRect 0.25 0.25 0.5 0.5)
-			, layoutHook = avoidStruts  $  smartBorders $ myLayoutHook
+			{ manageHook = manageDocks <+> myFloatHook <+> manageHook defaultConfig <+> scratchpadManageHook (W.RationalRect 0.25 0.25 0.5 0.5)
+			, layoutHook = avoidStruts $ smartBorders $ myLayoutHook
 			, logHook    = dynamicLogWithPP $ xmobarPP
 				{ ppOutput = hPutStrLn xmproc
+				, ppUrgent = xmobarColor "#cc0000" "" . wrap "**" "**"
 				, ppTitle  = xmobarColor "#8AE234" ""
 				}
 			}
@@ -47,5 +57,16 @@ main = do
 			, ("M-a", windowPromptBring defaultXPConfig { position = Top })
 			, ("M-x", sendMessage ToggleStruts)
 			, ("M-S-l", spawn "~/bin/lock")
+			, ("M-<Left>", moveTo Prev HiddenNonEmptyWS)
+			, ("M-S-<Left>", shiftToPrev)
+			, ("M-<Right>", moveTo Next HiddenNonEmptyWS)
+			, ("M-S-<Right>", shiftToNext)
+			, ("M-<Up>", windows W.focusUp)
+			, ("M-S-<Up>", windows W.swapUp)
+			, ("M-<Down>", windows W.focusDown)
+			, ("M-S-<Down>", windows W.swapDown)
+			, ("M-`", toggleWS)
+			, ("M-s", moveTo Next EmptyWS)
+			, ("M-S-s", shiftTo Next EmptyWS)
 			, ("M-g", scratchpadSpawnAction defaultConfig)
 			]
diff --git a/zsh/00_options b/zsh/00_options
index f5b1bae..6a7f0d3 100755
--- a/zsh/00_options
+++ b/zsh/00_options
@@ -2,7 +2,9 @@
 WORDCHARS=''
 
 # disable core dumps
-limit coredumpsize 0
+if ( limit coredumpsize >/dev/null 2>&1) ; then
+    limit coredumpsize 0
+fi
 
 # clear on exit
 trap clear 0
diff --git a/zsh/bindkey b/zsh/bindkey
index 83eeb24..4aea150 100755
--- a/zsh/bindkey
+++ b/zsh/bindkey
@@ -30,6 +30,7 @@ case $TERM in
 		bindkey '\e[c' emacs-forward-word
 		bindkey '\e[d' emacs-backward-word
 		bindkey '\M-B\M-^H' backward-kill-word
+		bindkey '\M-C\M-?' backward-kill-word
 	;;
 	mlterm|kterm)
 		bindkey '\e[H' beginning-of-line
@@ -72,6 +73,9 @@ case $TERM in
 	cygwin*)
 		bindkey '\e[1~' beginning-of-line
 		bindkey '\e[4~' end-of-line
+		bindkey '\e[1;5C' emacs-forward-word
+		bindkey '\e[1;5D' emacs-backward-word
+		bindkey '\e[3~' delete-char
 	;;
 esac