diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc
index b102c85..241f157 100755
--- a/payloads/libpayload/bin/lpgcc
+++ b/payloads/libpayload/bin/lpgcc
@@ -27,20 +27,26 @@
 ## SUCH DAMAGE.
 
 # GCC wrapper for libpayload
+if [ -z "${V}" ] && [ "${V}" = 1 ]; then
+	DEBUGME=1
+else
+	DEBUGME=0
+fi
+
+if [ $DEBUGME -eq 1 ]; then
+	echo "CC = $CC"
+fi
+
 # let's not recurse.
 # This is a hack, I know, but it makes sure that really simple user errors
 # don't fork-bomb your machine.
-# echo "CC = $CC"
-
 if [ -n "$CC" ]; then
-b=`basename $CC`
+b=`basename "$CC"`
 if [ "$b" = "lpgcc" ]; then
 CC=""
 fi
 fi
 
-
-
 if [ "$CC" != "" ]; then
 DEFAULT_CC=$CC
 else
@@ -62,7 +68,6 @@
 	return $?
 }
 
-DEBUGME=0
 DOLINK=1
 
 # This variable will contain the command line that the user wants to