diff --git a/bin/vim b/bin/vim
index 443799f..e04e7dc 100755
--- a/bin/vim
+++ b/bin/vim
@@ -1,2 +1,11 @@
 #!/bin/sh
-exec /usr/local/bin/vim -p "$@"
+#####################################################################
+VIM_ARGS=(-p)
+VIM=/usr/bin/vim
+#####################################################################
+
+SOURCE_BUILD=/usr/local/bin/vim
+[ -f $SOURCE_BUILD ] && VIM=$SOURCE_BUILD
+
+#####################################################################
+exec $(printf "%q " $VIM ${VIM_ARGS[@]} $@)
diff --git a/config/tmux.conf b/config/tmux.conf
index df99452..46c366e 100644
--- a/config/tmux.conf
+++ b/config/tmux.conf
@@ -1,5 +1,10 @@
 # don't use escape key
 set -sg escape-time 0
+
+# don't use 'repeat" keys
+# (causes delay annoyances with '~/.wryn/scwrypts/ssh/omni/tmux.conf')
+set -sg repeat-time 0
+
 set-option -g default-shell /bin/zsh
 
 # quick reload
diff --git a/vim/en.utf-8.add b/vim/en.utf-8.add
index ce65ff1..3150521 100644
--- a/vim/en.utf-8.add
+++ b/vim/en.utf-8.add
@@ -112,3 +112,4 @@ Kat
 submodule
 submodules
 CloudFlare
+Cloudflare
diff --git a/vim/en.utf-8.add.spl b/vim/en.utf-8.add.spl
index ccb9d41..acf79d6 100644
Binary files a/vim/en.utf-8.add.spl and b/vim/en.utf-8.add.spl differ
diff --git a/zsh/alias b/zsh/alias
index e0f446f..ee768e7 100644
--- a/zsh/alias
+++ b/zsh/alias
@@ -12,7 +12,30 @@ alias restart='clear; source ~/.zshrc'
 
 alias fix='vim $(git diff --name-only | uniq) -p'
 
-alias w='watch -tn1 '
+#####################################################################
+
+w() { # fancy(?) version of "alias w='watch -tcn1 '"
+	local WATCH_ARGS=()
+
+	WATCH_ARGS+=(--no-title)
+	WATCH_ARGS+=(--color)
+	WATCH_ARGS+=(--interval 1)
+
+	# don't add delay if command is available to /bin/sh
+	/bin/sh -c "command -v $1" >/dev/null 2>&1 && {
+		watch ${WATCH_ARGS[@]} $@
+		return $?
+	}
+
+	# quickly reduce first-order aliases
+	alias $1 >/dev/null 2>&1 && {
+		watch ${WATCH_ARGS[@]} $(which $1 | sed 's/.*aliased to //') ${@:2}
+		return $?
+	}
+
+	# import zshrc and inject current environment
+	watch ${WATCH_ARGS[@]} "zsh -c 'source ~/.zshrc >/dev/null 2>&1; $(while read e; do printf 'export '; printf '%q ' "$e"; echo; done < <(env) | grep '='); echo \"   $@\n---------------------------------------------------- \$(date +%H:%m:%S)\"; $@'"
+}
 
 #####################################################################