diff --git a/dotfiles/curlrc b/dotfiles/curlrc
index d9532b9..e3a7ab0 100644
--- a/dotfiles/curlrc
+++ b/dotfiles/curlrc
@@ -1,4 +1,3 @@
 tlsv1
-user-agent = "Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0 Safari/537.36"
 create-dirs
 referer = ";auto"
diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
index adafb95..d1682b7 100644
--- a/dotfiles/tmux.conf
+++ b/dotfiles/tmux.conf
@@ -57,3 +57,7 @@ bind M \
     set -g mouse-select-pane off \;\
     set -g mouse-select-window off \;\
     display 'Mouse: OFF'
+
+# tmux X clipboard integration
+bind C-c run "tmux show-buffer | xsel -i -b"
+bind C-v run "tmux set-buffer -- \"$(xsel -o -b)\"; tmux paste-buffer"
diff --git a/dotfiles/zpreztorc b/dotfiles/zpreztorc
index 9558803..5d928ad 100644
--- a/dotfiles/zpreztorc
+++ b/dotfiles/zpreztorc
@@ -214,7 +214,7 @@ zstyle ':prezto:module:python:virtualenv' initialize 'yes'
 zstyle ':prezto:module:tmux:auto-start' local 'no'
 
 # Auto start a session when Zsh is launched in a SSH connection.
-zstyle ':prezto:module:tmux:auto-start' remote 'yes'
+zstyle ':prezto:module:tmux:auto-start' remote 'no'
 
 # Integrate with iTerm2.
 # zstyle ':prezto:module:tmux:iterm' integrate 'yes'
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 834fc95..20432f7 100755
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -32,6 +32,8 @@ fi
 if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
   source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
 fi
+# noglob scp is so annoying
+unalias scp
 
 # Overrides to prezto
 unsetopt cdablevars
@@ -46,8 +48,17 @@ typeset -U path
 # Keybindings
 bindkey '^[[A' history-search-backward
 bindkey '^[[B' history-search-forward
+# ctrl-arrow keys
 bindkey '^[[1;5C' forward-word
 bindkey '^[[1;5D' backward-word
+bindkey '^P' up-history
+bindkey '^N' down-history
+bindkey '^?' backward-delete-char
+bindkey '^h' backward-delete-char
+# ok, a few convenience bindings
+bindkey '^w' backward-kill-word
+bindkey '^r' history-incremental-search-backward
+
 
 # Source extras and aliases if interactive
 if [[ $- == *i* ]] ; then
@@ -67,12 +78,3 @@ fi
 
 # Load any local settings
 if [ -e $HOME/.zshrc.local ] ; then source $HOME/.zshrc.local ; fi
-
-function start_esp {
-  if [ ! -d ${HOME}/tools/esp ] ; then
-    echo "ESP not installed!" >/dev/stderr
-    return 1
-  fi
-  export PATH="${PATH}:${HOME}/tools/esp/xtensa-esp32-elf/bin"
-  export IDF_PATH="${HOME}/tools/esp/esp-idf"
-}