diff --git a/020_zsh-zunit_checkinstall.sh b/020_zsh-zunit_checkinstall.sh
index 4c2e52b..cd92aba 100644
--- a/020_zsh-zunit_checkinstall.sh
+++ b/020_zsh-zunit_checkinstall.sh
@@ -33,27 +33,27 @@ BASE_TMP_DIR=~/tmptmp/checkinstall_tmp
 #-------------------------------------------------------------------------------
 
 ## Create and populate the install scripts and documentation for checkinstall
-cat >${BUILD_DIR}/description-pak <<EOF
+cat <<-EOF | tee ${BUILD_DIR}/description-pak
 ZUnit is a powerful unit testing framework for ZSH
 EOF
 
 # | preinstall-pak  | Run BEFORE the package is INSTALLED  |
-cat >${BUILD_DIR}/preinstall-pak <<EOF
+cat <<-EOF | tee ${BUILD_DIR}/preinstall-pak
 #!/usr/bin/env bash
 EOF
 
 # | postinstall-pak | Run AFTER the package is INSTALLED   |
-cat >${BUILD_DIR}/postinstall-pak <<EOF
+cat <<-EOF | tee ${BUILD_DIR}/postinstall-pak
 #!/usr/bin/env bash
 EOF
 
 # | preremove-pak   | Run BEFORE the package is REMOVED    |
-cat >${BUILD_DIR}/preremove-pak <<EOF
+cat <<-EOF | tee ${BUILD_DIR}/preremove-pak
 #!/usr/bin/env bash
 EOF
 
 # | postremove-pak  | Run AFTER the package is REMOVED
-cat >${BUILD_DIR}/postremove-pak <<EOF
+cat <<-EOF | tee ${BUILD_DIR}/postremove-pak
 #!/usr/bin/env bash
 EOF
 
@@ -61,10 +61,10 @@ EOF
 mkdir -p ${BUILD_DIR}/doc-pak
 #cp README INSTALL COPYING Changelog TODO CREDITS doc-pak
 
-cat >${BUILD_DIR}/doc-pak/README <<EOF
+cat <<-EOF | tee ${BUILD_DIR}/doc-pak/README
 EOF
 
-cat >${BUILD_DIR}/checkinstall_it.sh <<FOE
+cat <<-FOE | tee ${BUILD_DIR}/checkinstall_it.sh
 
 ## Checkinstall variables - see defaults in /etc/checkinstallrc
 DOC_DIR=/usr/share/doc
@@ -93,24 +93,28 @@ checkinstall -y --fstrans \
 FOE
 
 echo "Writing install.sh to: ${BUILD_DIR}/install.sh"
-cat >${BUILD_DIR}/install.sh <<FOE
+cat <<-FOE | tee ${BUILD_DIR}/install.sh
 #!/usr/bin/env bash
 set -e
 #set -x
 
 # Install revolver
-curl -L https://raw.githubusercontent.com/molovo/revolver/master/revolver > /usr/local/bin/revolver
+INSTALL_DIR=/usr/local/bin
+curl -L https://raw.githubusercontent.com/molovo/revolver/master/revolver > ${INSTALL_DIR}/revolver
+
+chmod +x ${INSTALL_DIR}/revolver
 
 # Build ZUnit from source
-git clone https://github.com/zunit-zsh/zunit $BUILD_DIR/zunit
-cd $BUILD_DIR/zunit
+git clone https://github.com/zunit-zsh/zunit ${BUILD_DIR}/zunit
+cd ${BUILD_DIR}/zunit
 ./build.zsh
 
 # Copy zunit into $path
-cp zunit /usr/local/bin
+cp zunit ${INSTALL_DIR}
+chmod +x ${INSTALL_DIR}/zunit
 
 # Optional, copy ZUnit ZSH completion into $fpath
-cp zunit.zsh-completion "${fpath[1]}/_zunit"
+cp zunit.zsh-completion "${fpath[1]}/_zu
 FOE
 
 bash ${BUILD_DIR}/checkinstall_it.sh