diff --git a/README.md b/README.md
index 394d4d8..dc9f6d6 100644
--- a/README.md
+++ b/README.md
@@ -33,15 +33,15 @@ echo "deb https://deb.nodesource.com/node_11.x sid main" >> /etc/apt/sources.lis
 
 The following command will install all required packages:
 ```
-apt-get --no-install-recommends install apt-transport-tor aspell clamav-daemon clamav-freshclam clamav-milter composer curl dovecot-imapd dovecot-pop3d git dnsmasq haveged hunspell iptables locales-all logrotate mariadb-server nano nginx-full postfix postfix-mysql \
+apt-get --no-install-recommends install apt-transport-tor aspell bzip2 clamav-daemon clamav-freshclam clamav-milter composer curl dovecot-imapd dovecot-pop3d git dnsmasq haveged hunspell iptables locales-all logrotate mariadb-server nano nginx-full postfix postfix-mysql \
 php7.3-bcmath php7.3-bz2 php7.3-cli php7.3-curl php7.3-dba php7.3-enchant php7.3-fpm php7.3-gd php7.3-gmp php7.3-imap php7.3-intl php7.3-json php7.3-mbstring php7.3-mysql php7.3-opcache php7.3-pspell php7.3-readline php7.3-recode php7.3-soap php7.3-sqlite3 php7.3-tidy php7.3-xml php7.3-xmlrpc php7.3-xsl php7.3-zip \
 php-apcu php-gnupg php-imagick quota quotatool rsync sasl2-bin ssh subversion tor unzip vim vsftpd wget yarn zip && apt-get --no-install-recommends install adminer
 ```
 
 Note that both, debian and the torproject have hidden service package archives, so you may want to edit /etc/apt/sources.list to load from those instead:
 ```
-deb tor+http://vwakviie2ienjx6t.onion/debian sid main
-deb tor+http://sdscoq7snqtznauu.onion/torproject.org sid main
+deb tor://vwakviie2ienjx6t.onion/debian sid main
+deb tor://sdscoq7snqtznauu.onion/torproject.org sid main
 ```
 
 Copy (and modify according to your needs) the site files in `var/www` to `/var/www` and the configuration files in `etc` to `/etc` after installation has finished. Then restart some services:
diff --git a/var/www/setup_chroot.sh b/var/www/setup_chroot.sh
index e82d258..bf077db 100755
--- a/var/www/setup_chroot.sh
+++ b/var/www/setup_chroot.sh
@@ -55,6 +55,8 @@ CHROOT_DIRECTORY_STRUCTURE=(
     '/tmp'
     '/usr'
     '/usr/share'
+    '/usr/share/bash-completion'
+    '/usr/share/bash-completion/completions'
     '/usr/bin'
     '/usr/lib'
     '/usr/lib/openssh'
@@ -96,6 +98,7 @@ BINARIES_GENERAL=(
     '/usr/bin/find'
     '/usr/bin/openssl'
     '/bin/tar'
+    '/bin/bzip2'
     '/bin/gzip'
     '/bin/gunzip'
     '/usr/bin/zip'
@@ -103,6 +106,8 @@ BINARIES_GENERAL=(
     '/usr/bin/curl'
     '/usr/bin/rsync'
     '/usr/bin/scp'
+    '/usr/bin/sftp'
+    '/usr/bin/ssh'
     '/usr/bin/wget'
     '/usr/bin/php7.3'
     '/usr/bin/mysql'
@@ -119,6 +124,7 @@ BINARIES_GENERAL=(
     '/bin/nano'
     '/usr/bin/vim'
     '/usr/bin/vi'
+    '/usr/bin/awk'
 )
 FILES_GENERAL=(
     '/etc/hosts'
@@ -133,6 +139,31 @@ FILES_GENERAL=(
     '/etc/profile'
     '/etc/bash_completion'
     '/etc/bash.bashrc'
+    '/usr/share/bash-completion/bash_completion'
+    '/usr/share/bash-completion/completions/alias'
+    '/usr/share/bash-completion/completions/bind'
+    '/usr/share/bash-completion/completions/bzip2'
+    '/usr/share/bash-completion/completions/compgen'
+    '/usr/share/bash-completion/completions/complete'
+    '/usr/share/bash-completion/completions/curl'
+    '/usr/share/bash-completion/completions/declare'
+    '/usr/share/bash-completion/completions/export'
+    '/usr/share/bash-completion/completions/find'
+    '/usr/share/bash-completion/completions/function'
+    '/usr/share/bash-completion/completions/git'
+    '/usr/share/bash-completion/completions/gzip'
+    '/usr/share/bash-completion/completions/id'
+    '/usr/share/bash-completion/completions/kill'
+    '/usr/share/bash-completion/completions/mysql'
+    '/usr/share/bash-completion/completions/openssl'
+    '/usr/share/bash-completion/completions/pwd'
+    '/usr/share/bash-completion/completions/rsync'
+    '/usr/share/bash-completion/completions/scp'
+    '/usr/share/bash-completion/completions/sh'
+    '/usr/share/bash-completion/completions/sftp'
+    '/usr/share/bash-completion/completions/tar'
+    '/usr/share/bash-completion/completions/typeset'
+    '/usr/share/bash-completion/completions/wget'
 )
 DIRECTORIES_GENERAL=(
     '/usr/lib/git-core'
@@ -142,7 +173,6 @@ DIRECTORIES_GENERAL=(
     '/etc/ssl'
     '/usr/lib/ssl'
     '/usr/share/ca-certificates'
-    '/usr/share/bash-completion'
     '/etc/bash_completion.d'
     '/usr/share/zoneinfo'
     '/lib/terminfo'