diff --git a/etools b/etools
index 0078609..0265c43 100644
--- a/etools
+++ b/etools
@@ -4,7 +4,7 @@
 
 # NOTE: parse config, gets run when sourced
 function etools_configure() {
-	ETOOLS_DIR=$(dirname "${BASH_SOURCE[0]}")
+	ETOOLS_DIR="$PWD/$(dirname "${BASH_SOURCE[0]}")"
 	. "$ETOOLS_DIR"/config.sh
 	_configure
 	"$ETOOLS_DIR"/config.sh
@@ -123,6 +123,10 @@ function etools_unset() {
 		ETOOLS_COLOR_ERROR \
 		ETOOLS_GREP_CMD \
 		ETOOLS_DEBUG \
+		ETOOLS_CHECK_LIVE \
+		ETOOLS_CHECK_TESTING \
+		package_weights \
+		package_offset \
 		etools_configure \
 		etools_smart_find \
 		etools_get_version \
@@ -133,9 +137,10 @@ function etools_unset() {
 		eerror;
 	do
 		unset $variable
-		"$ETOOLS_DIR"/helper.sh
-		"$ETOOLS_DIR"/config.sh
 	done
+	"$ETOOLS_DIR"/helper.sh
+	"$ETOOLS_DIR"/config.sh
+	unset ETOOLS_DIR
 }
 
 
diff --git a/helper.sh b/helper.sh
index 978c327..ead6c53 100755
--- a/helper.sh
+++ b/helper.sh
@@ -122,7 +122,7 @@ function _default_sort() {
 	done
 }
 
-function _etools_print_assoc_array {
+function _etools_print_assoc_array() {
     for key in "${!_etools_packages[@]}"; do
         echo "$key: ${_etools_packages[$key]}"
     done