diff --git a/Config.in b/Config.in
index 4f8a02b..2500bc5 100644
--- a/Config.in
+++ b/Config.in
@@ -386,6 +386,16 @@ menu "--- General Settings"
 			#   Any missing file will be downloaded and archived here,
 			#   if the user has the right priviledges.
 
+	config SERVER
+		string "FTP mirror"
+		default "ftp://ftp.lfs-matrix.net"
+		depends GETPKG
+		help
+			#-- FTP mirror to download packages and patches if not found
+			#   in $SRC_ARCHIVE
+			#   As a last resort, the files will dowloaded from upstream,
+                        #   if possible.
+
 	config	GETKERNEL
 		bool	"Always retrieve kernel package"
 		default	n
@@ -627,9 +637,9 @@ menu "--- Advanced Features"
 			#-- Run farce testing
 	#--- End ICA/farce
 
-	#-- Optimizations
+	#--- Optimizations
 	config	CONFIG_OPTIMIZE
-		bool	"Use optimization "
+		bool	"Use optimization (see help)"
 		default	n
 		help
 			#-- Actual optimzation flags MUST be defined in ./optimize/*
@@ -663,18 +673,47 @@ menu "--- Advanced Features"
 		default	"2"	if OPT_2
 	#--- End Optimizations
 
+	#-- Internal Settings
+	menu "--- Internal Settings (WARNING: for jhalfs developers only)"
+
+		config	SCRIPT_ROOT
+			string	"Scripts root"
+			default "jhalfs"
+
+		config	JHALFSDIR
+			string "jhalfs directory"
+			default "$BUILDDIR/$SCRIPT_ROOT"
+
+		config	LOGDIR
+			string "Build logs directory"
+			default "$JHALFSDIR/logs"
+
+		config	TESTLOGDIR
+			string "Test suites logs directory"
+			default "$JHALFSDIR/test-logs"
+
+		config	ICALOGDIR
+			string "ICA logs directory"
+			default "$LOGDIR/ICA"
+
+		config	FARCELOGDIR
+			string "farce logs directory"
+			default "$LOGDIR/farce"
+
+		config	MKFILE
+			string "Makefile"
+			default "$JHALFSDIR/Makefile"
+
+		config	XSL
+			string "XSL stylesheet"
+			default "$PROGNAME.xsl"
+
+		config	PKG_LST
+			string "Package contents list"
+			default "unpacked"
+
+	#--- End Internal Settings
+	endmenu
+
 #--- End Advanced Features
 endmenu
-
-#	config	CONFIG_BLFS_CMDS
-#		bool	"Add BLFS packages to current build"
-#		default	n
-#		depends	!BOOK_HLFS && XXX
-#		help
-#			#--- Select this option if you wish to install any BLFS packages
-#			#    as part of your {c,h}lfs build.
-#			#    Any needed packages will be downloaded to the /sources dir
-#	config	BLFS_CMDLINE
-#		string	"BLFS packages"
-#		default	"none"
-#		depends	CONFIG_BLFS_CMDS
diff --git a/Makefile b/Makefile
index 73a1324..d5ae127 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ CONFIG_CONFIG_IN = Config.in
 CONFIG = menu
 
 all: menuconfig
-	@clear
+#	@clear
 	@`grep RUN_ME configuration | sed -e 's@RUN_ME=\"@@' -e 's@\"@@' `
 
 $(CONFIG)/conf:
diff --git a/master.sh b/master.sh
index 7e0091b..15661ed 100755
--- a/master.sh
+++ b/master.sh
@@ -51,24 +51,9 @@ source configuration
 [[ $? > 0 ]] && echo "file:configuration did not load.." && exit 1
 [[ $VERBOSITY > 0 ]] && echo "OK"
 
-      #--- CONSTANTS
+      #--- Envars not sourced from configuration (yet)
 declare -r SVN="svn://svn.linuxfromscratch.org"
 declare -r LOG=000-masterscript.log
-      # --- Server used if the file isn't found in SRC_ARCHIVE.
-      # As a last resort, the file will dowloaded from upstream, if possible.
-     SERVER=ftp://ftp.lfs-matrix.net
-      #--- Working directories
-SCRIPT_ROOT=jhalfs
-  JHALFSDIR=$BUILDDIR/$SCRIPT_ROOT
-     LOGDIR=$JHALFSDIR/logs
- TESTLOGDIR=$JHALFSDIR/test-logs
-     MKFILE=$JHALFSDIR/Makefile
-      #--- ICA report log directory
-  ICALOGDIR=$LOGDIR/ICA
-      #--- farce report log directory
-FARCELOGDIR=$LOGDIR/farce
-        XSL=$PROGNAME.xsl
-    PKG_LST=unpacked
 
 case $PROGNAME in
   clfs2) LFSVRS=development; TREE=branches/clfs-2.0/BOOK ;;