diff --git a/bin/easyengine b/bin/easyengine
index 362791a5..be8a4718 100644
--- a/bin/easyengine
+++ b/bin/easyengine
@@ -311,9 +311,9 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then
 			ee_lib_service nginx php5-fpm mysql postfix $EE_SECOND
 	else
 		ee_lib_echo "ee stack commands:"
-		ee_lib_echo_escape "\tinstall\tInstall NGINX, PHP5, MySQL, Postfix, Adminer, phpMyAdmin, WP-CLI and Utils"
-		ee_lib_echo_escape "\tremove\tRemove NGINX, PHP5, MySQL, Postfix, Adminer, phpMyAdmin, WP-CLI and Utils"
-		ee_lib_echo_escape "\tpurge\tPurge NGINX, PHP5, MySQL, Postfix, Adminer, phpMyAdmin, WP-CLI and Utils"
+		ee_lib_echo_escape "\tinstall\tInstall NGINX, PHP5, MySQL, Postfix, Adminer, phpMyAdmin, WP-CLI , Utils, Mailscanner and Admin tools"
+		ee_lib_echo_escape "\tremove\tRemove NGINX, PHP5, MySQL, Postfix, Adminer, phpMyAdmin, WP-CLI, Utils, Mailscanner and Admin tools"
+		ee_lib_echo_escape "\tpurge\tPurge NGINX, PHP5, MySQL, Postfix, Adminer, phpMyAdmin, WP-CLI, Utils, Mailscanner and Admin tools"
 		ee_lib_echo_escape "\tstatus\tDisplay system status information"
 		ee_lib_echo_escape "\tstart\tStart NGINX, PHP5, MySQL and Postfix service"
 		ee_lib_echo_escape "\tstop\tStop NGINX, PHP5, MySQL and Postfix service"
@@ -752,6 +752,7 @@ elif [ "$EE_FIRST" = "site" ]; then
 	
 	else
 		ee_lib_echo "ee site commands:"
+		ee_lib_echo_escape "\tcd\tSwitch to website root directory"
 		ee_lib_echo_escape "\tlist\tList NGINX enabled website"
 		ee_lib_echo_escape "\tinfo\tDisplay information about given website"
 		ee_lib_echo_escape "\tshow\tDisplay NGINX configuration for given website"
@@ -760,6 +761,8 @@ elif [ "$EE_FIRST" = "site" ]; then
 		ee_lib_echo_escape "\tedit\tEdit NGINX configuration for given website"
 		ee_lib_echo_escape "\tcreate\tCreate new HTML, PHP, MySQL or WordPress website"
 		ee_lib_echo_escape "\tdelete\tDelete existing website"
+		ee_lib_echo_escape "\tlog\tMonitor access and error logs for single or multiple websites"
+		ee_lib_echo_escape "\tupdate\tupdate current website"
 	fi
 
 # EasyEngine debug
@@ -891,6 +894,7 @@ else
 	ee_lib_echo_escape "\tversion\tDisplay EasyEngine (ee) version"
 	ee_lib_echo_escape "\thelp\tDisplay EasyEngine (ee) man page"
 	ee_lib_echo_escape "\tinfo\tDisplay Information about NGINX, PHP5, MySQL"
+	ee_lib_echo_escape "\tclean\tClean Nginx FastCGI cache/OPcache/Memcache/all cache"
 	ee_lib_echo_escape "\tstack\tInstall/Remove/Purge NGINX, PHP, MySQL, Postfix"
 	ee_lib_echo_escape "\tsite\tPerform various site specific operation"
 	ee_lib_echo_escape "\tdebug\tPerform various debugging operation"
diff --git a/config/bash_completion.d/ee b/config/bash_completion.d/ee
index e6acf6a3..b0253c33 100644
--- a/config/bash_completion.d/ee
+++ b/config/bash_completion.d/ee
@@ -27,7 +27,7 @@ function EE_AUTO()
 
 		# List of suggested words
 		easyengine|ee)
-			COMPREPLY=( $(compgen -W '$(echo clean version help info update; command find /usr/local/lib/easyengine/modules/ -maxdepth 1 -type d -printf "%P " 2> /dev/null)' -- $CURRENT) )
+			COMPREPLY=( $(compgen -W '$(echo clean version help info update import-slow-log; command find /usr/local/lib/easyengine/modules/ -maxdepth 1 -type d -printf "%P " 2> /dev/null)' -- $CURRENT) )
 			return 0
 			;;
 
@@ -37,7 +37,12 @@ function EE_AUTO()
 			;;
 
 		install|remove|purge)
-			COMPREPLY=( $( compgen -W '$(echo mail all web mailscanner; cd /usr/local/lib/easyengine/modules/stack/install; find -maxdepth 1 -type f | grep install | cut -d'_' -f4 | cut -d '.' -f1 2> /dev/null; cd /usr/local/lib/easyengine/vendor/; find  -type f | grep install | cut -d'_' -f4 | cut -d '.' -f1 2> /dev/null | egrep -v "roundcube|vimbadmin" )' -- $CURRENT ) )
+			COMPREPLY=( $( compgen -W '$(echo mail all web mailscanner admin; cd /usr/local/lib/easyengine/modules/stack/install; find -maxdepth 1 -type f | grep install | cut -d'_' -f4 | cut -d '.' -f1 2> /dev/null; cd /usr/local/lib/easyengine/vendor/; find  -type f | grep install | cut -d'_' -f4 | cut -d '.' -f1 2> /dev/null | egrep -v "roundcube|vimbadmin" )' -- $CURRENT ) )
+			return 0
+			;;
+
+		clean)
+			COMPREPLY=( $( compgen -W '$(echo cd fastcgi memcache opcache all;)' -- $CURRENT ) )
 			return 0
 			;;
 
@@ -69,7 +74,7 @@ function EE_AUTO()
 			;;
 
 		debug)
-			COMPREPLY=( $(compgen -W '$(command cd /usr/local/lib/easyengine/modules/debug/; find  -type f | grep debug | cut -d'_' -f4 | cut -d '.' -f1 | sed 's/^/--/g' 2> /dev/null)' -- $CURRENT) )
+			COMPREPLY=( $(compgen -W '$(echo --import-slow-log-interval; command cd /usr/local/lib/easyengine/modules/debug/; find  -type f | grep debug | cut -d'_' -f4 | cut -d '.' -f1 | sed 's/^/--/g' 2> /dev/null)' -- $CURRENT) )
 			return 0
 			;;