diff --git a/functions/additional.function b/functions/additional.function
index ba66cba..a2b6706 100644
--- a/functions/additional.function
+++ b/functions/additional.function
@@ -5,6 +5,8 @@ TEMPCRON=${MYPATH}/cron.tmp
 DIR=${MYPATH}/temp
 WHO=$(whoami)
 mkdir -p ${DIR}
+BUILDDIR=$HOME/.bap-source-files
+mkdir -p ${BUILDDIR}
 
 source ${MYPATH}/config
 
@@ -223,13 +225,14 @@ CQRLOG() {
 
 	sudo ln -s /usr/lib/arm-linux-gnueabihf/libmariadbclient.so /usr/lib/libmysqlclient.so
 
-	cd
+	cd ${BUILDDIR}
 	git clone https://github.com/ok2cqr/cqrlog.git
 	cd cqrlog
 	make
 	sudo make install
+	sudo make clean
 	cd ..
-	rm -rf cqrlog
+	#rm -rf cqrlog
 
 	cat >cqrlog.desktop <<EOF
 [Desktop Entry]
@@ -270,7 +273,7 @@ CHIRP() {
 ##################################
 GARIM() {
 	GPKG=$(curl -s https://www.whitemesa.net/garim/src/ | grep tar.gz | tail -1 | sed 's/^.*garim/garim/' | sed 's/tar.gz.*$/tar.gz/')
-	cd ${DIR} || return
+	cd ${BUILDDIR} || return
 	wget --tries 2 --connect-timeout=60 https://www.whitemesa.net/garim/src/$GPKG
 	tar -xzvf $GPKG
 	DIRR=$(echo $GPKG | sed 's/.tar.gz//')
@@ -278,6 +281,9 @@ GARIM() {
 	./configure
 	make
 	sudo make install
+	sudo make clean
+	cd ${BUILDDIR} || return
+	rm *.gz
 }
 
 ##################################
@@ -286,7 +292,7 @@ GARIM() {
 QSSTV() {
 	sudo apt-get install -y g++ libfftw3-dev qt5-default libpulse-dev libhamlib-dev libasound2-dev libv4l-dev libopenjp2-7 libopenjp2-7-dev
 
-	cd ${HOME}/Downloads || return
+	cd ${BUILDDIR} || return
 
 	TAR=$(curl -s http://users.telenet.be/on4qz/qsstv/downloads/ | grep tar.gz | sed 's/.*href="//' | sed 's/">.*$//' | tail -1)
 	wget --tries 2 --connect-timeout=60 http://users.telenet.be/on4qz/qsstv/downloads/$TAR
@@ -296,6 +302,9 @@ QSSTV() {
 	qmake
 	make
 	sudo make install
+	sudo make clean
+	cd ${BUILDDIR} || return
+	rm *.gz
 
 cat >qsstv.desktop <<EOF
 [Desktop Entry]
@@ -351,22 +360,24 @@ PROPAGATION() {
 	sudo apt-get install -y gfortran yelp python3-gi python3-gi-cairo rarian-compat gnome-doc-utils pkg-config python3-dateutil python3-mpltoolkits.basemap python3-cairocffi libgtk-3-dev
 
 	#install primary program
-	cd ${HOME}/Downloads || return
+	cd ${BUILDDIR} || return
 	wget --tries 2 --connect-timeout=60 https://www.qsl.net/hz1jw/voacapl/downloads/voacapl-0.7.2.tar.gz
 	tar -xzf voacapl-0.7.2.tar.gz
 	cd voacapl-0.7.2 || return
 	./configure
 	make
 	sudo make install
+	sudo make clean
 
 	#install gui app for propagation reports
-	cd ${HOME}/Downloads
+	cd ${BUILDDIR}
 	wget --tries 2 --connect-timeout=60 https://www.qsl.net/hz1jw/pythonprop/downloads/pythonprop-0.28.tar.gz
 	tar -xzf pythonprop-0.28.tar.gz
 	cd pythonprop-0.28
 	./configure
 	sudo make install
-	${HOME}/Downloads/voacapl-0.7.2/makeitshfbc
+	sudo make clean
+	${BUILDDIR}/voacapl-0.7.2/makeitshfbc
 }
 
 ##################################
@@ -412,7 +423,7 @@ XASTIR() {
 		gv libcurl4-openssl-dev shapelib libshp-dev libpcre3-dev libproj-dev libdb-dev python-dev \
 		libax25-dev libwebp-dev libwebp-dev libgraphicsmagick1-dev festival festival-dev
 
-	cd || return
+	cd ${BUILDDIR} || return
 	git clone https://github.com/Xastir/Xastir.git
 	cd Xastir || return
 	./bootstrap.sh
@@ -421,8 +432,7 @@ XASTIR() {
 	../configure
 	make
 	sudo make install
-	cd || return
-	rm -rf Xastir
+	sudo make clean
 
 	cat >xastir.desktop <<EOF
 [Desktop Entry]
@@ -586,7 +596,7 @@ GPREDICT() {
 ##################################
 TQSL() {
 	sudo apt install -y cmake g++ libexpat1-dev libssl-dev libdb++-dev libcurl4-openssl-dev libwxgtk3.0-dev
-	cd ${HOME} || return
+	cd ${BUILDDIR} || return
 	CUR=$(curl -s http://www.arrl.org/tqsl-download | grep "for Linux" | sed 's/.*TQSL //' | awk '{print $1}')
 	wget http://www.arrl.org/tqsl/tqsl-${CUR}.tar.gz
 	tar -xzvf tqsl-${CUR}.tar.gz
@@ -595,8 +605,9 @@ TQSL() {
 	cmake .
 	make
 	sudo make install
-	sudo cp /home/pi/tqsl-${CUR}/apps/tqsl.desktop /usr/share/applications/
-	rm -rf "${HOME}/tqsl-${CUR}"
+	sudo make clean
+	sudo cp ${BUILDDIR}/tqsl-${CUR}/apps/tqsl.desktop /usr/share/applications/
+
 }
 
 ##################################