diff --git a/src/.config b/src/.config
index 82d6aaa2d..3ee5237e6 100644
--- a/src/.config
+++ b/src/.config
@@ -8,7 +8,7 @@
 #
 #   http://kernel.org
 #
-KERNEL_SOURCE_URL=http://kernel.org/pub/linux/kernel/v4.x/linux-4.5.5.tar.xz
+KERNEL_SOURCE_URL=http://kernel.org/pub/linux/kernel/v4.x/linux-4.6.5.tar.xz
 
 # You can find the latest GNU libc source bundles here:
 #
@@ -62,7 +62,7 @@ FELIX_SOURCE_URL=http://www-us.apache.org/dist/felix/org.apache.felix.main.distr
 #   JAVA_ARCHIVE=/home/ivan/Downloads/jdk-8u91-linux-x64.tar.gz
 #
 #JAVA_ARCHIVE=/absolute/path/to/java.archive.tar.gz
-JAVA_ARCHIVE=/home/ivan/Downloads/jdk-8u91-linux-x64.tar.gz
+#JAVA_ARCHIVE=/home/ivan/Downloads/jdk-8u91-linux-x64.tar.gz
 
 
 
@@ -116,7 +116,7 @@ OVERLAY_TYPE=folder
 # internet. This is useful when you have already downloaded the sources and have
 # no internet connection. Or if you want to share your version of "Minimal Linux
 # Live" with predefined sources.
-USE_LOCAL_SOURCE=true
+USE_LOCAL_SOURCE=false
 
 # Copy "Minimal Linux Live" source files and folders in '/src' inside initramfs.
 # The default value is 'true'. You can use any other value, no value, or comment
@@ -148,7 +148,7 @@ COPY_SOURCE_ISO=true
 # felix      - Apache Felix OSGi framework.
 #
 #OVERLAY_BUNDLES=glibc_full,links,dropbear,java,felix
-OVERLAY_BUNDLES=glibc_full,java,felix
+#OVERLAY_BUNDLES=glibc_full,java,felix
 
 # This property enables the standard penguin boot logo in the upper left corner
 # of the screen. The property is used in 'xx_build_kernel.sh'. The default value
diff --git a/src/12_generate_iso.sh b/src/12_generate_iso.sh
index c9f809b46..4122c4464 100755
--- a/src/12_generate_iso.sh
+++ b/src/12_generate_iso.sh
@@ -1,5 +1,16 @@
 #!/bin/sh
 
+# TODO - this shell script file needs serios refactoring since right now it does
+# too many things:
+# 
+# 1) Deal with 'src' copy.
+# 2) Generate the 'overlay' software bundles.
+# 3) Create proper overlay structure.
+# 4) Prepare the actual ISO structure.
+# 5) Generate the actual ISO image.
+#
+# Probably it's best to create separate shell scripts for each functionality. 
+
 echo "*** GENERATE ISO BEGIN ***"
 
 SRC_DIR=$(pwd)