diff --git a/lib/edit-command-line.zsh b/lib/edit-command-line.zsh
new file mode 100644
index 000000000..db2000325
--- /dev/null
+++ b/lib/edit-command-line.zsh
@@ -0,0 +1,3 @@
+autoload -U edit-command-line
+zle -N edit-command-line
+bindkey '\C-x\C-e' edit-command-line
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index acb8df057..8ed291fcf 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -46,7 +46,8 @@ alias pacmir='sudo pacman -Syy'                # Force refresh of all package li
 paclist() {
   sudo pacman -Qei $(pacman -Qu|cut -d" " -f 1)|awk ' BEGIN {FS=":"}/^Name/{printf("\033[1;36m%s\033[1;37m", $2)}/^Description/{print $2}'
 }
-alias paclsorhpans='sudo pacman -Qdt'
+
+alias paclsorphans='sudo pacman -Qdt'
 alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
 
 pacdisowned() {
diff --git a/plugins/cake/cake.plugin.zsh b/plugins/cake/cake.plugin.zsh
index 75997521a..f968c71d5 100644
--- a/plugins/cake/cake.plugin.zsh
+++ b/plugins/cake/cake.plugin.zsh
@@ -1,18 +1,18 @@
 # Set this to 1 if you want to cache the tasks
-cacheTaskList=1
+cache_task_list=1
 
 # Cache filename
-cacheFile='.cake-task-cache'
+cache_file='.cake_task_cache'
 
 _cake_does_target_list_need_generating () {
 
-	if [ $cacheTaskList -eq 0 ]; then
+	if [ $cache_task_list -eq 0 ]; then
 		return 1;
 	fi
 
-	if [ ! -f $cacheFile ]; then return 0;
+	if [ ! -f $cache_file ]; then return 0;
 	else
-		accurate=$(stat -f%m $cacheFile)
+		accurate=$(stat -f%m $cache_file)
 		changed=$(stat -f%m Cakefile)
 		return $(expr $accurate '>=' $changed)
 	fi
@@ -21,8 +21,8 @@ _cake_does_target_list_need_generating () {
 _cake () {
 	if [ -f Cakefile ]; then
 		if _cake_does_target_list_need_generating; then
-			cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$' > $cacheFile
-			compadd `cat $cacheFile`
+			cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$' > $cache_file
+			compadd `cat $cache_file`
 		else
 			compadd `cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$'`
 		fi