diff --git a/.gitignore b/.gitignore
index 56d0a21228f7..e80740950775 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
+locals.zsh
 log/.zsh_history
-
 projects.zsh
diff --git a/completion.zsh b/completion.zsh
index c993620ce906..795903d0dee5 100644
--- a/completion.zsh
+++ b/completion.zsh
@@ -19,7 +19,7 @@ zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:
 zstyle ':completion:*' list-colors ''
 zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
 
-#unsetopt MENU_COMPLETE
+unsetopt MENU_COMPLETE
 #setopt AUTO_MENU
 
 # should this be in keybindings?
@@ -31,3 +31,10 @@ zstyle ':completion:*:*:*:*:*' menu yes select
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
 zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
 zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/known_hosts`
+
+
+#complete on history
+# zstyle ':completion:*:history-words' stop yes
+# zstyle ':completion:*:history-words' remove-all-dups yes
+# zstyle ':completion:*:history-words' list false
+# zstyle ':completion:*:history-words' menu yes
\ No newline at end of file
diff --git a/directories.zsh b/directories.zsh
index 32b801470e6e..31d5336bf36f 100644
--- a/directories.zsh
+++ b/directories.zsh
@@ -1,5 +1,5 @@
 # Changing/making/removing directory
-
+setopt auto_name_dirs
 
 alias ..='cd ..'
 alias cd..='cd ..'
diff --git a/key-bindings.zsh b/key-bindings.zsh
index 43082ae1fafa..2fae6d05daeb 100644
--- a/key-bindings.zsh
+++ b/key-bindings.zsh
@@ -1,6 +1,8 @@
 # TODO: Explain what some of this does..
 autoload -U compinit
 compinit
+
+bindkey -e
 bindkey '\ew' kill-region
 bindkey -s '\el' "ls\n"
 bindkey -s '\e.' "..\n"
diff --git a/prompt.zsh b/prompt.zsh
index 31c33feb5e56..39689684f725 100644
--- a/prompt.zsh
+++ b/prompt.zsh
@@ -1,19 +1,12 @@
 export PAGER=less
 export LC_CTYPE=en_US.UTF-8
 
-bindkey -e
+# speed stuff.
 
-# Directory stuff.
-setopt AUTO_NAME_DIRS
-
-# Speed stuff.
-
-#setopt NO_BEEP
-setopt AUTO_CD
-setopt MULTIOS
-setopt CDABLEVARS
-
-bindkey -e
+#setopt no_beep
+setopt auto_cd
+setopt multios
+setopt cdablevarS
 
 if [[ x$WINDOW != x ]]
 then