diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index 3bb2be1b..7960f16d 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -164,7 +164,6 @@ reset_compiler_targets() {
 }
 
 
-
 cd "${BASE_DIR}"
 
 ####build commands
@@ -180,7 +179,6 @@ buildbot_log() {
 
 build_libretro_generic_makefile() {
 
-
 	NAME=$1
 	DIR=$2
 	SUBDIR=$3
@@ -638,7 +636,6 @@ while read line; do
 			echo BUILDBOT JOB: $jobid $NAME already up-to-date...
 		fi
 		echo
-
 	fi
 
 	cd "${BASE_DIR}"
@@ -784,9 +781,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
 			echo $MESSAGE
 		fi
 		buildbot_log "$MESSAGE"
-
 	fi
-
 fi
 
 if [ "${PLATFORM}" = "theos_ios" ] && [ "${RA}" = "YES" ]; then
diff --git a/libretro-buildbot-task.sh b/libretro-buildbot-task.sh
index ce1bfeeb..5f9fdfa6 100755
--- a/libretro-buildbot-task.sh
+++ b/libretro-buildbot-task.sh
@@ -14,7 +14,7 @@
 
 ####environment configuration:
 echo "BUILDBOT JOB: Setting up Environment for $1"
-echo 
+echo
 
 ORIGPATH=$PATH
 WORK=$PWD
@@ -28,7 +28,6 @@ while read line; do
 	if [ "${KEY}" = "PATH" ]; then
 		export PATH=${VALUE}:${ORIGPATH}
 		echo New PATH: $PATH
-
 	else
 		export ${KEY}=${VALUE}
 		echo $KEY: $VALUE
@@ -37,7 +36,7 @@ done < $1.conf
 echo
 echo
 
-. ./libretro-config.sh
+. $WORK/libretro-config.sh
 
 echo
 [[ "${ARM_NEON}" ]] && echo 'ARM NEON opts enabled...' && export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}-neon"
@@ -74,7 +73,6 @@ fi
 mkdir -v -p "$RARCH_DIST_DIR"
 
 if [ "${PLATFORM}" = "android" ]; then
-
 	IFS=' ' read -ra ABIS <<< "$TARGET_ABIS"
 	for a in "${ABIS[@]}"; do
 		echo $a
@@ -171,7 +169,6 @@ reset_compiler_targets() {
 }
 
 
-
 cd "${BASE_DIR}"
 
 ####build commands
@@ -179,13 +176,10 @@ buildbot_log() {
 
 	HASH=`echo -n "$1" | openssl sha1 -hmac $SIG | cut -f 2 -d " "`
 	curl --data "message=$1&sign=$HASH" $LOGURL
-
-
 }
 
 build_libretro_generic_makefile() {
 
-
 	NAME=$1
 	DIR=$2
 	SUBDIR=$3
@@ -201,8 +195,6 @@ build_libretro_generic_makefile() {
 		JOBS=1
 	fi
 
-
-
 	if [ -z "${NOCLEAN}" ]; then
 		echo "cleaning up..."
 		echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean"
@@ -237,11 +229,9 @@ build_libretro_generic_makefile() {
 	echo BUILDBOT JOB: $MESSAGE
 	buildbot_log "$MESSAGE"
 	JOBS=$OLDJ
-
 }
 
 build_libretro_generic_theos() {
-
 	echo PARAMETERS: DIR $2, SUBDIR: $3, MAKEFILE: $4
 
 	NAME=$1
@@ -254,9 +244,6 @@ build_libretro_generic_theos() {
 	cd $DIR
 	cd $SUBDIR
 
-	ln -s $THEOS theos
-
-
 	if [ -z "${NOCLEAN}" ]; then
 		echo "cleaning up..."
 		echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean"
@@ -285,11 +272,9 @@ build_libretro_generic_theos() {
 	fi
 	echo BUILDBOT JOB: $MESSAGE
 	buildbot_log "$MESSAGE"
-
 }
 
 build_libretro_generic_jni() {
-
 	echo PARAMETERS: DIR $2, SUBDIR: $3
 
 	NAME=$1
@@ -313,7 +298,7 @@ build_libretro_generic_jni() {
 			fi
 		fi
 
-	echo "compiling for ${a}..."
+		echo "compiling for ${a}..."
 		if [ -z "${ARGS}" ]; then
 			echo "build command: ${NDK} -j${JOBS} APP_ABI=${a}"
 			${NDK} -j${JOBS} APP_ABI=${a}
@@ -332,13 +317,9 @@ build_libretro_generic_jni() {
 			buildbot_log "$MESSAGE"
 		fi
 	done
-
-
-
 }
 
 build_libretro_bsnes_jni() {
-
 	echo PARAMETERS: DIR $2, SUBDIR: $3
 
 	NAME=$1
@@ -380,14 +361,12 @@ build_libretro_bsnes_jni() {
 		fi
 		echo BUILDBOT JOB: $MESSAGE
 		buildbot_log "$MESSAGE"
-
 	done
 }
 
 
 build_libretro_generic_gl_makefile() {
 
-
 	NAME=$1
 	DIR=$2
 	SUBDIR=$3
@@ -395,7 +374,6 @@ build_libretro_generic_gl_makefile() {
 	PLATFORM=$5
 	ARGS=$6
 
-
 	check_opengl
 
 	cd $DIR
@@ -431,14 +409,11 @@ build_libretro_generic_gl_makefile() {
 	buildbot_log "$MESSAGE"
 
 	reset_compiler_targets
-
-
 }
 
 
 build_libretro_bsnes() {
 
-
 	NAME=$1
 	DIR=$2
 	PROFILE=$3
@@ -446,22 +421,18 @@ build_libretro_bsnes() {
 	PLATFORM=$5
 	BSNESCOMPILER=$6
 
-
 	cd $DIR
 
-
 	if [ -z "${NOCLEAN}" ]; then
 		echo "cleaning up..."
 
 		rm -f obj/*.{o,"${FORMAT_EXT}"}
 		rm -f out/*.{o,"${FORMAT_EXT}"}	
 
-
 		if [ "${PROFILE}" = "cpp98" -o "${PROFILE}" = "bnes" ]; then
 			${MAKE} clean
 		fi
 
-
 		if [ $? -eq 0 ]; then
 			echo BUILDBOT JOB: $jobid $1 cleanup success!
 		else
@@ -471,7 +442,6 @@ build_libretro_bsnes() {
 
 	echo "compiling..."
 
-
 	if [ "${PROFILE}" = "cpp98" ]; then
 		${MAKE} platform="${PLATFORM}" ${COMPILER} "-j${JOBS}"
 	elif [ "${PROFILE}" = "bnes" ]; then
@@ -496,7 +466,6 @@ build_libretro_bsnes() {
 	fi
 	echo BUILDBOT JOB: $MESSAGE
 	buildbot_log "$MESSAGE"
-
 }
 
 #fetch a project and mark it for building if there have been any changes
@@ -515,7 +484,6 @@ fi
 echo
 echo
 while read line; do
-
 	NAME=`echo $line | cut -f 1 -d " "`
 	DIR=`echo $line | cut -f 2 -d " "`
 	URL=`echo $line | cut -f 3 -d " "`
@@ -525,14 +493,12 @@ while read line; do
 	MAKEFILE=`echo $line | cut -f 7 -d " "`
 	SUBDIR=`echo $line | cut -f 8 -d " "`
 
-
 	if [ ! -z "$TASK" ]; then
 		if [ "${TASK}" != "${NAME}" ]; then
 			continue
 		fi
 	fi
 
-
 	if [ "${ENABLED}" = "YES" ]; then
 		echo "BUILDBOT JOB: $jobid Processing $NAME"
 		echo
@@ -545,7 +511,6 @@ while read line; do
 		echo SUBDIR: $SUBDIR
 		DIR=$3
 
-
 		ARGS=""
 
 		TEMP=`echo $line | cut -f 9 -d " "`
@@ -605,13 +570,11 @@ while read line; do
 			echo BUILDBOT JOB: $jobid $NAME already up-to-date...
 		fi
 		echo
-
 	fi
 
 	cd "${BASE_DIR}"
 	PREVCORE=$NAME
 	PREVBUILD=$BUILD
-
 done < $1
 
 echo 
@@ -626,9 +589,7 @@ if [ ! -z "$TASK" ]; then
 fi
 
 if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" = "YES" ]; then
-
 	while read line; do
-
 		NAME=`echo $line | cut -f 1 -d " "`
 		DIR=`echo $line | cut -f 2 -d " "`
 		URL=`echo $line | cut -f 3 -d " "`
@@ -689,9 +650,10 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" =
 
 		fi
 
-	echo
-	echo
+		echo
+		echo
 	done < $1.ra
+
 	if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
 
 		cd $3
@@ -757,9 +719,7 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" =
 			echo $MESSAGE
 			buildbot_log "$MESSAGE"
 		fi
-
 	fi
-
 fi
 
 PATH=$ORIGPATH