diff --git a/lib/completion.zsh b/lib/completion.zsh
index 2a457402a..b3cc91822 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -59,7 +59,7 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
 # ... unless we really want to.
 zstyle '*' single-ignored show
 
-if [ "$DISABLE_COMPLETION_WAITING_DOTS" != "true" ]; then
+if [ "x$COMPLETION_WAITING_DOTS" = "xtrue" ]; then
   expand-or-complete-with-dots() {
     echo -n "\e[31m......\e[0m"
     zle expand-or-complete
diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 9c2dda35a..5c1b90bfa 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -14,10 +14,15 @@ bindkey '^[[B' down-line-or-search
 
 bindkey "^[[H" beginning-of-line
 bindkey "^[[1~" beginning-of-line
+bindkey "^[OH" beginning-of-line
 bindkey "^[[F"  end-of-line
 bindkey "^[[4~" end-of-line
+bindkey "^[OF" end-of-line
 bindkey ' ' magic-space    # also do history expansion on space
 
+bindkey "^[[1;5C" forward-word
+bindkey "^[[1;5D" backward-word
+
 bindkey '^[[Z' reverse-menu-complete
 
 # Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 5132b639a..4fcf9425d 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -29,6 +29,10 @@ alias glg='git log --stat --max-count=5'
 compdef _git glg=git-log
 alias glgg='git log --graph --max-count=5'
 compdef _git glgg=git-log
+alias gss='git status -s'
+compdef _git gss=git-status
+alias ga='git add'
+compdef _git ga=git-add
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
index a7153bb57..e455527e7 100644
--- a/plugins/lol/lol.plugin.zsh
+++ b/plugins/lol/lol.plugin.zsh
@@ -8,19 +8,30 @@ alias rtfm='man'
 alias visible='echo'
 alias invisible='cat'
 alias moar='more'
+alias tldr='less'
+alias alwayz='tail -f'
 
 alias icanhas='mkdir'
+alias gimmeh='touch'
 alias donotwant='rm'
 alias dowant='cp'
 alias gtfo='mv'
+alias nowai='chmod'
 
 alias hai='cd'
+alias iz='ls'
 alias plz='pwd'
+alias ihasbucket='df -h'
 
 alias inur='locate'
+alias iminurbase='finger'
+
+alias btw='nice'
+alias obtw='nohup'
 
 alias nomz='ps -aux'
 alias nomnom='killall'
 
+alias byes='exit'
 alias cya='reboot'
 alias kthxbai='halt'
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 4de1fa4e9..1ab40aba6 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -19,8 +19,8 @@ ZSH_THEME="robbyrussell"
 # Uncomment following line if you want to disable autosetting terminal title.
 # DISABLE_AUTO_TITLE="true"
 
-# Uncomment following line if you want disable red dots displayed while waiting for completion
-# DISABLE_COMPLETION_WAITING_DOTS="true"
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+# COMPLETION_WAITING_DOTS="true"
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)