diff --git a/CH7Build/CH07.01-gettext.sh b/CH7Build/CH07.01-gettext.sh
index 99b6833..cea9695 100644
--- a/CH7Build/CH07.01-gettext.sh
+++ b/CH7Build/CH07.01-gettext.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d gettext-${gettext_version} ] && rm -rf gettext-${gettext_version}
 
@@ -20,5 +20,15 @@ if [ $? -ne 0 ]; then
   myfail "Failed building gettext"
 fi
 
-cp -v gettext-tools/src/{msgfmt,msgmerge,xgettext} /usr/bin
+cp gettext-tools/src/{msgfmt,msgmerge,xgettext} /usr/bin
+
+popd
+
+# cleanup
+
+pushd ${GLSOURCES}
+
+rm -rf gettext-${gettext_version}
+
+popd
 
diff --git a/CH7Build/CH07.02-bison.sh b/CH7Build/CH07.02-bison.sh
index 9bdce02..e84bcad 100644
--- a/CH7Build/CH07.02-bison.sh
+++ b/CH7Build/CH07.02-bison.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d bison-${bison_version} ] && rm -rf bison-${bison_version}
 
@@ -26,3 +26,13 @@ make install
 if [ $? -ne 0 ]; then
   myfail "Failed installing bison"
 fi
+
+popd
+
+# cleanup
+
+pushd ${GLSOURCES}
+
+rm -rf bison-${bison_version}
+
+popd
diff --git a/CH7Build/CH07.03-perl.sh b/CH7Build/CH07.03-perl.sh
index 2028344..a37a71b 100644
--- a/CH7Build/CH07.03-perl.sh
+++ b/CH7Build/CH07.03-perl.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d perl-${perl_version} ] && rm -rf perl-${perl_version}
 
@@ -36,3 +36,13 @@ make install
 if [ $? -ne 0 ]; then
   myfail "Failed installing perl"
 fi
+
+popd
+
+# cleanup
+
+pushd ${GLSOURCES}
+
+rm -rf perl-${perl_version}
+
+popd
diff --git a/CH7Build/CH07.04-python.sh b/CH7Build/CH07.04-python.sh
index 537f73c..58d79f6 100644
--- a/CH7Build/CH07.04-python.sh
+++ b/CH7Build/CH07.04-python.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d Python-${python_version} ] && rm -rf Python-${python_version}
 
@@ -27,3 +27,13 @@ make install
 if [ $? -ne 0 ]; then
   myfail "Failed installing python"
 fi
+
+popd
+
+# cleanup
+
+pushd ${GLSOURCES}
+
+rm -rf Python-${python_version}
+
+popd
diff --git a/CH7Build/CH07.05-texinfo.sh b/CH7Build/CH07.05-texinfo.sh
index 76b5618..123a6cd 100644
--- a/CH7Build/CH07.05-texinfo.sh
+++ b/CH7Build/CH07.05-texinfo.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d texinfo-${texinfo_version} ] && rm -rf texinfo-${texinfo_version}
 
@@ -25,3 +25,13 @@ make install
 if [ $? -ne 0 ]; then
   myfail "Failed installing texinfo"
 fi
+
+popd
+
+# cleanup
+
+pushd ${GLSOURCES}
+
+rm -rf texinfo-${texinfo_version}
+
+popd
diff --git a/CH7Build/CH07.06-util-linux.sh b/CH7Build/CH07.06-util-linux.sh
index df2f683..e96d5a5 100644
--- a/CH7Build/CH07.06-util-linux.sh
+++ b/CH7Build/CH07.06-util-linux.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d util-linux-${util_linux_version} ] && rm -rf util-linux-${util_linux_version}
 
@@ -39,3 +39,13 @@ make install
 if [ $? -ne 0 ]; then
   myfail "Failed installing util-linux"
 fi
+
+popd
+
+# cleanup
+
+pushd ${GLSOURCES}
+
+rm -rf util-linux-${util_linux_version}
+
+popd
diff --git a/CH7Build/Master.sh b/CH7Build/Master.sh
index 3f30fc8..93f77b3 100644
--- a/CH7Build/Master.sh
+++ b/CH7Build/Master.sh
@@ -6,7 +6,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH07.01-gettext.sh"
   exit 1
 else
-  echo "LFS Chapter 7 Gettext Complete"
+  echo "LFS Chapter 7 Gettext Complete [1/6]"
   sleep 3
 fi
 
@@ -16,7 +16,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH07.02-bison.sh"
   exit 1
 else
-  echo "LFS Chapter 7 Bison Complete"
+  echo "LFS Chapter 7 Bison Complete [2/6]"
   sleep 3
 fi
 
@@ -26,7 +26,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH07.03-perl.sh"
   exit 1
 else
-  echo "LFS Chapter 7 Perl Complete"
+  echo "LFS Chapter 7 Perl Complete [3/6]"
   sleep 3
 fi
 
@@ -36,7 +36,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH07.04-python.sh"
   exit 1
 else
-  echo "LFS Chapter 7 Python Complete"
+  echo "LFS Chapter 7 Python Complete [4/6]"
   sleep 3
 fi
 
@@ -46,7 +46,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH07.05-texinfo.sh"
   exit 1
 else
-  echo "LFS Chapter 7 Texinfo Complete"
+  echo "LFS Chapter 7 Texinfo Complete [5/6]"
   sleep 3
 fi
 
@@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then
   echo "failed CH07.06-util-linux.sh"
   exit 1
 else
-  echo "LFS Chapter 7 Util-Linux Complete"
+  echo "LFS Chapter 7 Util-Linux Complete [6/6]"
   sleep 3
 fi