diff --git a/bin/hardening/2.18_disable_cramfs.sh b/bin/hardening/2.18_disable_cramfs.sh
index e8ceba4..e9df2c1 100755
--- a/bin/hardening/2.18_disable_cramfs.sh
+++ b/bin/hardening/2.18_disable_cramfs.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# Hardening script skeleton replace this line with proper point treated
+# 2.18 Disable Mounting of cramfs Filesystems (Not Scored)
 #
 
 set -e # One error, it's over
@@ -32,7 +32,7 @@ apply () {
     if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
         warn "I cannot fix $KERNEL_OPTION enabled, recompile your kernel please"
     else
-        ok "$KERNEL_OPTION is diabled, nothing to do"
+        ok "$KERNEL_OPTION is disabled, nothing to do"
     fi
     :
 }
diff --git a/bin/hardening/2.19_disable_freevxfs.sh b/bin/hardening/2.19_disable_freevxfs.sh
new file mode 100755
index 0000000..0d43421
--- /dev/null
+++ b/bin/hardening/2.19_disable_freevxfs.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+#
+# CIS Debian 7 Hardening
+#
+
+#
+# 2.19 Disable Mounting of freevxfs Filesystems (Not Scored)
+#
+
+set -e # One error, it's over
+set -u # One variable unset, it's over
+
+# Assumption made : yu have a monolothic kernel with your config zipped in /proc/config.gz
+KERNEL_OPTION="freevxfs"
+
+
+# This function will be called if the script status is on enabled / audit mode
+audit () {
+    is_kernel_option_enabled $KERNEL_OPTION
+    if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
+        crit "$KERNEL_OPTION is enabled !"
+    else
+        ok "$KERNEL_OPTION is disabled"
+    fi
+    :
+}
+
+# This function will be called if the script status is on enabled mode
+apply () {
+    is_kernel_option_enabled $KERNEL_OPTION
+    if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
+        warn "I cannot fix $KERNEL_OPTION enabled, recompile your kernel please"
+    else
+        ok "$KERNEL_OPTION is disabled, nothing to do"
+    fi
+    :
+}
+
+# This function will check config parameters required
+check_config() {
+    :
+}
+
+# Source Root Dir Parameter
+if [ ! -r /etc/default/cis-hardenning ]; then
+    echo "There is no /etc/default/cis-hardenning file, cannot source CIS_ROOT_DIR variable, aborting"
+    exit 128
+else
+    . /etc/default/cis-hardenning
+    if [ -z $CIS_ROOT_DIR ]; then
+        echo "No CIS_ROOT_DIR variable, aborting"
+    fi
+fi 
+
+# Main function, will call the proper functions given the configuration (audit, enabled, disabled)
+[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
diff --git a/bin/hardening/2.20_disable_jffs2.sh b/bin/hardening/2.20_disable_jffs2.sh
new file mode 100755
index 0000000..c892e96
--- /dev/null
+++ b/bin/hardening/2.20_disable_jffs2.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+#
+# CIS Debian 7 Hardening
+#
+
+#
+# 2.20 Disable Mounting of jffs2 Filesystems (Not Scored)
+#
+
+set -e # One error, it's over
+set -u # One variable unset, it's over
+
+# Assumption made : yu have a monolothic kernel with your config zipped in /proc/config.gz
+KERNEL_OPTION="jffs2"
+
+
+# This function will be called if the script status is on enabled / audit mode
+audit () {
+    is_kernel_option_enabled $KERNEL_OPTION
+    if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
+        crit "$KERNEL_OPTION is enabled !"
+    else
+        ok "$KERNEL_OPTION is disabled"
+    fi
+    :
+}
+
+# This function will be called if the script status is on enabled mode
+apply () {
+    is_kernel_option_enabled $KERNEL_OPTION
+    if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
+        warn "I cannot fix $KERNEL_OPTION enabled, recompile your kernel please"
+    else
+        ok "$KERNEL_OPTION is disabled, nothing to do"
+    fi
+    :
+}
+
+# This function will check config parameters required
+check_config() {
+    :
+}
+
+# Source Root Dir Parameter
+if [ ! -r /etc/default/cis-hardenning ]; then
+    echo "There is no /etc/default/cis-hardenning file, cannot source CIS_ROOT_DIR variable, aborting"
+    exit 128
+else
+    . /etc/default/cis-hardenning
+    if [ -z $CIS_ROOT_DIR ]; then
+        echo "No CIS_ROOT_DIR variable, aborting"
+    fi
+fi 
+
+# Main function, will call the proper functions given the configuration (audit, enabled, disabled)
+[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
diff --git a/bin/hardening/2.21_disable_hfs.sh b/bin/hardening/2.21_disable_hfs.sh
new file mode 100755
index 0000000..073e539
--- /dev/null
+++ b/bin/hardening/2.21_disable_hfs.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+#
+# CIS Debian 7 Hardening
+#
+
+#
+# 2.21 Disable Mounting of hfs Filesystems (Not Scored)
+#
+
+set -e # One error, it's over
+set -u # One variable unset, it's over
+
+# Assumption made : yu have a monolothic kernel with your config zipped in /proc/config.gz
+KERNEL_OPTION="hfs"
+
+
+# This function will be called if the script status is on enabled / audit mode
+audit () {
+    is_kernel_option_enabled $KERNEL_OPTION
+    if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
+        crit "$KERNEL_OPTION is enabled !"
+    else
+        ok "$KERNEL_OPTION is disabled"
+    fi
+    :
+}
+
+# This function will be called if the script status is on enabled mode
+apply () {
+    is_kernel_option_enabled $KERNEL_OPTION
+    if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
+        warn "I cannot fix $KERNEL_OPTION enabled, recompile your kernel please"
+    else
+        ok "$KERNEL_OPTION is disabled, nothing to do"
+    fi
+    :
+}
+
+# This function will check config parameters required
+check_config() {
+    :
+}
+
+# Source Root Dir Parameter
+if [ ! -r /etc/default/cis-hardenning ]; then
+    echo "There is no /etc/default/cis-hardenning file, cannot source CIS_ROOT_DIR variable, aborting"
+    exit 128
+else
+    . /etc/default/cis-hardenning
+    if [ -z $CIS_ROOT_DIR ]; then
+        echo "No CIS_ROOT_DIR variable, aborting"
+    fi
+fi 
+
+# Main function, will call the proper functions given the configuration (audit, enabled, disabled)
+[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
diff --git a/bin/hardening/2.22_disable_hfsplus.sh b/bin/hardening/2.22_disable_hfsplus.sh
new file mode 100755
index 0000000..81d47bf
--- /dev/null
+++ b/bin/hardening/2.22_disable_hfsplus.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+#
+# CIS Debian 7 Hardening
+#
+
+#
+# 2.22 Disable Mounting of hfsplus Filesystems (Not Scored)
+#
+
+set -e # One error, it's over
+set -u # One variable unset, it's over
+
+# Assumption made : yu have a monolothic kernel with your config zipped in /proc/config.gz
+KERNEL_OPTION="hfsplus"
+
+
+# This function will be called if the script status is on enabled / audit mode
+audit () {
+    is_kernel_option_enabled $KERNEL_OPTION
+    if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
+        crit "$KERNEL_OPTION is enabled !"
+    else
+        ok "$KERNEL_OPTION is disabled"
+    fi
+    :
+}
+
+# This function will be called if the script status is on enabled mode
+apply () {
+    is_kernel_option_enabled $KERNEL_OPTION
+    if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
+        warn "I cannot fix $KERNEL_OPTION enabled, recompile your kernel please"
+    else
+        ok "$KERNEL_OPTION is disabled, nothing to do"
+    fi
+    :
+}
+
+# This function will check config parameters required
+check_config() {
+    :
+}
+
+# Source Root Dir Parameter
+if [ ! -r /etc/default/cis-hardenning ]; then
+    echo "There is no /etc/default/cis-hardenning file, cannot source CIS_ROOT_DIR variable, aborting"
+    exit 128
+else
+    . /etc/default/cis-hardenning
+    if [ -z $CIS_ROOT_DIR ]; then
+        echo "No CIS_ROOT_DIR variable, aborting"
+    fi
+fi 
+
+# Main function, will call the proper functions given the configuration (audit, enabled, disabled)
+[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
diff --git a/bin/hardening/2.23_disable_squashfs.sh b/bin/hardening/2.23_disable_squashfs.sh
new file mode 100755
index 0000000..e5a059d
--- /dev/null
+++ b/bin/hardening/2.23_disable_squashfs.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+#
+# CIS Debian 7 Hardening
+#
+
+#
+# 2.23 Disable Mounting of squashfs Filesystems (Not Scored)
+#
+
+set -e # One error, it's over
+set -u # One variable unset, it's over
+
+# Assumption made : yu have a monolothic kernel with your config zipped in /proc/config.gz
+KERNEL_OPTION="squashfs"
+
+
+# This function will be called if the script status is on enabled / audit mode
+audit () {
+    is_kernel_option_enabled $KERNEL_OPTION
+    if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
+        crit "$KERNEL_OPTION is enabled !"
+    else
+        ok "$KERNEL_OPTION is disabled"
+    fi
+    :
+}
+
+# This function will be called if the script status is on enabled mode
+apply () {
+    is_kernel_option_enabled $KERNEL_OPTION
+    if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
+        warn "I cannot fix $KERNEL_OPTION enabled, recompile your kernel please"
+    else
+        ok "$KERNEL_OPTION is disabled, nothing to do"
+    fi
+    :
+}
+
+# This function will check config parameters required
+check_config() {
+    :
+}
+
+# Source Root Dir Parameter
+if [ ! -r /etc/default/cis-hardenning ]; then
+    echo "There is no /etc/default/cis-hardenning file, cannot source CIS_ROOT_DIR variable, aborting"
+    exit 128
+else
+    . /etc/default/cis-hardenning
+    if [ -z $CIS_ROOT_DIR ]; then
+        echo "No CIS_ROOT_DIR variable, aborting"
+    fi
+fi 
+
+# Main function, will call the proper functions given the configuration (audit, enabled, disabled)
+[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
diff --git a/bin/hardening/2.24_disable_udf.sh b/bin/hardening/2.24_disable_udf.sh
new file mode 100755
index 0000000..e49469c
--- /dev/null
+++ b/bin/hardening/2.24_disable_udf.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+#
+# CIS Debian 7 Hardening
+#
+
+#
+# 2.24 Disable Mounting of udf Filesystems (Not Scored)
+#
+
+set -e # One error, it's over
+set -u # One variable unset, it's over
+
+# Assumption made : yu have a monolothic kernel with your config zipped in /proc/config.gz
+KERNEL_OPTION="udf"
+
+
+# This function will be called if the script status is on enabled / audit mode
+audit () {
+    is_kernel_option_enabled $KERNEL_OPTION
+    if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
+        crit "$KERNEL_OPTION is enabled !"
+    else
+        ok "$KERNEL_OPTION is disabled"
+    fi
+    :
+}
+
+# This function will be called if the script status is on enabled mode
+apply () {
+    is_kernel_option_enabled $KERNEL_OPTION
+    if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
+        warn "I cannot fix $KERNEL_OPTION enabled, recompile your kernel please"
+    else
+        ok "$KERNEL_OPTION is disabled, nothing to do"
+    fi
+    :
+}
+
+# This function will check config parameters required
+check_config() {
+    :
+}
+
+# Source Root Dir Parameter
+if [ ! -r /etc/default/cis-hardenning ]; then
+    echo "There is no /etc/default/cis-hardenning file, cannot source CIS_ROOT_DIR variable, aborting"
+    exit 128
+else
+    . /etc/default/cis-hardenning
+    if [ -z $CIS_ROOT_DIR ]; then
+        echo "No CIS_ROOT_DIR variable, aborting"
+    fi
+fi 
+
+# Main function, will call the proper functions given the configuration (audit, enabled, disabled)
+[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
diff --git a/etc/conf.d/2.19_disable_freevxfs.cfg b/etc/conf.d/2.19_disable_freevxfs.cfg
new file mode 100644
index 0000000..acee522
--- /dev/null
+++ b/etc/conf.d/2.19_disable_freevxfs.cfg
@@ -0,0 +1,2 @@
+# Configuration for script of same name
+status=disabled
diff --git a/etc/conf.d/2.20_disable_jffs2.cfg b/etc/conf.d/2.20_disable_jffs2.cfg
new file mode 100644
index 0000000..acee522
--- /dev/null
+++ b/etc/conf.d/2.20_disable_jffs2.cfg
@@ -0,0 +1,2 @@
+# Configuration for script of same name
+status=disabled
diff --git a/etc/conf.d/2.21_disable_hfs.cfg b/etc/conf.d/2.21_disable_hfs.cfg
new file mode 100644
index 0000000..acee522
--- /dev/null
+++ b/etc/conf.d/2.21_disable_hfs.cfg
@@ -0,0 +1,2 @@
+# Configuration for script of same name
+status=disabled
diff --git a/etc/conf.d/2.22_disable_hfsplus.cfg b/etc/conf.d/2.22_disable_hfsplus.cfg
new file mode 100644
index 0000000..acee522
--- /dev/null
+++ b/etc/conf.d/2.22_disable_hfsplus.cfg
@@ -0,0 +1,2 @@
+# Configuration for script of same name
+status=disabled
diff --git a/etc/conf.d/2.23_disable_squashfs.cfg b/etc/conf.d/2.23_disable_squashfs.cfg
new file mode 100644
index 0000000..acee522
--- /dev/null
+++ b/etc/conf.d/2.23_disable_squashfs.cfg
@@ -0,0 +1,2 @@
+# Configuration for script of same name
+status=disabled
diff --git a/etc/conf.d/2.24_disable_udf.cfg b/etc/conf.d/2.24_disable_udf.cfg
new file mode 100644
index 0000000..acee522
--- /dev/null
+++ b/etc/conf.d/2.24_disable_udf.cfg
@@ -0,0 +1,2 @@
+# Configuration for script of same name
+status=disabled
diff --git a/lib/utils.sh b/lib/utils.sh
index 36e8572..59aaf68 100644
--- a/lib/utils.sh
+++ b/lib/utils.sh
@@ -7,12 +7,17 @@
 
 is_kernel_option_enabled() {
     local KERNEL_OPTION=$1
-    RESULT=$(zgrep -i $KERNEL_OPTION /proc/config.gz | grep -vE "^#")
+    RESULT=$(zgrep -i $KERNEL_OPTION /proc/config.gz | grep -vE "^#") || :
     ANSWER=$(cut -d = -f 2 <<< $RESULT)
     if [ "x$ANSWER" = "xy" ]; then
+        debug "Kernel option $KERNEL_OPTION enabled"
         FNRET=0
-    else
+    elif [ "x$ANSWER" = "xn" ]; then
+        debug "Kernel option $KERNEL_OPTION disabled"
         FNRET=1
+    else
+        debug "Kernel option $KERNEL_OPTION not found"
+        FNRET=2 # Not found
     fi
 }