diff --git a/zsh/00-init.zsh b/zsh/00-init.zsh
index 3395d07..30e11f0 100644
--- a/zsh/00-init.zsh
+++ b/zsh/00-init.zsh
@@ -3,3 +3,4 @@ zstyle :compinstall filename '${CONFIG_PATH}/.zshrc'
 
 setopt completealiases
 setopt correct
+setopt interactivecomments
diff --git a/zsh/30-keys.zsh b/zsh/30-keys.zsh
index c32db8d..6d969a2 100644
--- a/zsh/30-keys.zsh
+++ b/zsh/30-keys.zsh
@@ -16,7 +16,11 @@ if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
     zle -N zle-line-finish
 fi
 
-bindkey -e # Use emacs key bindings
+# Bash-like backward delete.
+autoload -U select-word-style
+select-word-style bash
+
+#bindkey -e # Use emacs key bindings
 bindkey '\ew' kill-region # [Esc-w] - Kill from the cursor to the mark
 bindkey -s '\el' 'ls\n' # [Esc-l] - run command: ls
 bindkey '^r' history-incremental-search-backward # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
@@ -54,8 +58,3 @@ else
     bindkey "^[3;5~" delete-char
     bindkey "\e[3~" delete-char
 fi
-
-# Edit the current command line in $EDITOR
-autoload -U edit-command-line
-zle -N edit-command-line
-bindkey '\C-x\C-e' edit-command-line
diff --git a/zsh/prompts/pztrn.zsh-theme b/zsh/prompts/pztrn.zsh-theme
index f7f0842..e454647 100644
--- a/zsh/prompts/pztrn.zsh-theme
+++ b/zsh/prompts/pztrn.zsh-theme
@@ -54,6 +54,8 @@ prompt_pztrn_setup () {
     p_path="$vars['brackets_start']$vars['default_color'] %d $vars['brackets_end']"
 
     PROMPT="$p_date$p_tty$p_plat$p_userpwd$p_shlvlhist$p_rc
+$vars['console']$p_path $p_end"
+    RPROMPT="$p_date$p_tty$p_plat$p_userpwd$p_shlvlhist$p_rc
 $vars['console']$p_path $p_end"
     PS2='%(4_.\.)%3_> %E'