diff --git a/README.md b/README.md
index dc79012..762881f 100644
--- a/README.md
+++ b/README.md
@@ -114,10 +114,10 @@ overriding
 
 # compression used, possible values xz (default, best compression), gzip, lzma, lzo, lz4
 # lz4 is faster but worst compression, may be useful for locally testing isos
-# iso_compression=xz
+# sfs_compress=xz
 
 # valid: md5, sha1, sha256, sha384, sha512
-# iso_checksum=md5
+# sfs_checksum=md5
 
 # possible values: openrc,systemd
 # initsys="systemd"
diff --git a/bin/buildiso.in b/bin/buildiso.in
index 5e59a93..fc3bc4b 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -102,8 +102,8 @@ display_settings(){
     msg2 "iso_label: %s" "${iso_label}"
     msg2 "iso_publisher: %s" "${iso_publisher}"
     msg2 "iso_app_id: %s" "${iso_app_id}"
-    msg2 "iso_compression: %s" "${iso_compression}"
-    msg2 "iso_checksum: %s" "${iso_checksum}"
+    msg2 "sfs_compress: %s" "${sfs_compress}"
+    msg2 "sfs_checksum: %s" "${sfs_checksum}"
     msg2 "use_overlayfs: %s" "${use_overlayfs}"
     ${verbose} && msg2 "iso_fs: %s" "${iso_fs}"
 
diff --git a/data/manjaro-tools.conf b/data/manjaro-tools.conf
index 2454a5c..824f738 100644
--- a/data/manjaro-tools.conf
+++ b/data/manjaro-tools.conf
@@ -63,10 +63,10 @@
 
 # compression used, possible values xz (default, best compression), gzip, lzma, lzo, lz4
 # lz4 is faster but worst compression, may be useful for locally testing isos
-# iso_compression=xz
+# sfs_compress=xz
 
 # valid: md5, sha1, sha256, sha384, sha512
-# iso_checksum=md5
+# sfs_checksum=md5
 
 # possible values: openrc,systemd
 # initsys="systemd"
diff --git a/docbook/manjaro-tools.conf.xml b/docbook/manjaro-tools.conf.xml
index 484cdb3..9234c9b 100644
--- a/docbook/manjaro-tools.conf.xml
+++ b/docbook/manjaro-tools.conf.xml
@@ -243,7 +243,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
         <varlistentry>
             <!-- TODO: Need list of other available compressions -->
-            <term><varname>iso_compression=</varname></term>
+            <term><varname>sfs_compress=</varname></term>
 
             <listitem><para>Defaults compression that will be used
             when creating the various images. Defaults to xz.
@@ -251,7 +251,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         </varlistentry>
 
         <varlistentry>
-            <term><varname>iso_checksum=</varname></term>
+            <term><varname>sfs_checksum=</varname></term>
 
             <listitem><para>Checksum that will be created against the
             final .iso file. Can be <option>md5</option> (the default),
diff --git a/initcpio/hooks/miso b/initcpio/hooks/miso
index 1703b96..abeb7da 100644
--- a/initcpio/hooks/miso
+++ b/initcpio/hooks/miso
@@ -46,7 +46,7 @@ _mnt_overlayfs() {
     local upper_dir="/run/miso/cowspace/${cow_directory}/upperdir"
 
     mkdir -p "${upper_dir}" "${work_dir}"
-    mount -t overlay overlay -o lowerdir="${lower_dir}",upperdir="${upper_dir}",workdir="${work_dir}" "${newroot}${mnt}"
+    mount -t overlay overlay -olowerdir="${lower_dir}",upperdir="${upper_dir}",workdir="${work_dir}" "${newroot}${mnt}"
 }
 
 # args: /path/to/image_file, mountpoint
diff --git a/lib/util-iso-overlayfs.sh b/lib/util-iso-overlayfs.sh
index 4326dce..0fe7b1a 100644
--- a/lib/util-iso-overlayfs.sh
+++ b/lib/util-iso-overlayfs.sh
@@ -17,20 +17,20 @@ track_image() {
 # $1: new branch
 mount_image(){
     IMAGE_ACTIVE_MOUNTS=()
-    mkdir -p "${work_dir}/work"
-    track_image -t overlay overlay -olowerdir="${work_dir}/rootfs",upperdir="$1",workdir="${work_dir}/work" "$1"
+    mkdir -p "${mnt_dir}/work"
+    track_image -t overlay overlay -olowerdir="${work_dir}/rootfs",upperdir="$1",workdir="${mnt_dir}/work" "$1"
 }
 
 mount_image_custom(){
     IMAGE_ACTIVE_MOUNTS=()
-    mkdir -p "${work_dir}/work"
-    track_image -t overlay overlay -olowerdir="${work_dir}/desktopfs":"${work_dir}/rootfs",upperdir="$1",workdir="${work_dir}/work" "$1"
+    mkdir -p "${mnt_dir}/work"
+    track_image -t overlay overlay -olowerdir="${work_dir}/desktopfs":"${work_dir}/rootfs",upperdir="$1",workdir="${mnt_dir}/work" "$1"
 }
 
 mount_image_live(){
     IMAGE_ACTIVE_MOUNTS=()
-    mkdir -p "${work_dir}/work"
-    track_image -t overlay overlay -olowerdir="${work_dir}/livefs":"${work_dir}/rootfs",upperdir="$1",workdir="${work_dir}/work" "$1"
+    mkdir -p "${mnt_dir}/work"
+    track_image -t overlay overlay -olowerdir="${work_dir}/livefs":"${work_dir}/rootfs",upperdir="$1",workdir="${mnt_dir}/work" "$1"
 }
 
 umount_image(){
@@ -38,6 +38,6 @@ umount_image(){
         info "%s umount: [%s]" "${iso_fs}" "${IMAGE_ACTIVE_MOUNTS[@]}"
         umount "${IMAGE_ACTIVE_MOUNTS[@]}"
         unset IMAGE_ACTIVE_MOUNTS
-        rm -rf "${work_dir}/work"
+        rm -rf "${mnt_dir}/work"
     fi
 }
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 84bc2e3..6d99cc8 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -89,10 +89,10 @@ prepare_ext4_img(){
     local ext4_args=()
     ${verbose} && ext4_args+=(-q)
     ext4_args+=(-O ^has_journal,^resize_inode -E lazy_itable_init=0 -m 0)
-    mkfs.ext4 ${ext4_args[@]} -F "${src}.img" >/dev/null
+    mkfs.ext4 ${ext4_args[@]} -F "${src}.img" &>/dev/null
     tune2fs -c 0 -i 0 "${src}.img" &> /dev/null
     mount_img "${work_dir}/${name}.img" "${mnt}"
-    msg2 "Copying %s to %s..." "${src}/" "${mnt}/"
+    msg2 "Copying %s ..." "${src}/"
     cp -aT "${src}/" "${mnt}/"
     umount_img "${mnt}"
 }
@@ -127,12 +127,12 @@ make_sfs() {
     msg2 "Creating SquashFS image, this may take some time..."
     local used_kernel=${kernel:5:1} mksfs_args=(${src} ${sfs} -noappend)
     local highcomp="-b 256K -Xbcj x86"
-    [[ "${iso_compression}" != "xz" ]] && highcomp=""
+    [[ "${sfs_compress}" != "xz" ]] && highcomp=""
 
     if [[ "${name}" == "mhwdfs" && ${used_kernel} < "4" ]]; then
         mksfs_args+=(-comp lz4)
     else
-        mksfs_args+=(-comp ${iso_compression} ${highcomp})
+        mksfs_args+=(-comp ${sfs_compress} ${highcomp})
     fi
     if ${verbose};then
         mksquashfs "${mksfs_args[@]}" >/dev/null
@@ -370,7 +370,7 @@ prepare_fat_img(){
     ${pxe_boot} && size=40M
     msg2 "Creating fat image of %s ..." "${size}"
     truncate -s ${size} "${img}"
-    mkfs.fat -n MISO_EFI "${img}" >/dev/null
+    mkfs.fat -n MISO_EFI "${img}" &>/dev/null
     mkdir -p "${mnt}"
     mount_img "${img}" "${mnt}"
     prepare_efiboot_image "${mnt}" "${iso_root}"
@@ -446,12 +446,12 @@ make_torrent(){
 
 # $1: file
 make_checksum(){
-    msg "Creating [%s] sum ..." "${iso_checksum}"
+    msg "Creating [%s] sum ..." "${sfs_checksum}"
     cd ${iso_dir}
-    local cs=$(${iso_checksum}sum $1)
-    msg2 "%s sum: %s" "${iso_checksum}" "${cs##*/}"
-    echo "${cs}" > ${iso_dir}/$1.${iso_checksum}
-    msg "Done [%s] sum" "${iso_checksum}"
+    local cs=$(${sfs_checksum}sum $1)
+    msg2 "%s sum: %s" "${sfs_checksum}" "${cs##*/}"
+    echo "${cs}" > ${iso_dir}/$1.${sfs_checksum}
+    msg "Done [%s] sum" "${sfs_checksum}"
 }
 
 compress_images(){
diff --git a/lib/util.sh b/lib/util.sh
index e0b3851..cd08bd3 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -301,9 +301,9 @@ init_buildiso(){
 
     [[ -z ${iso_app_id} ]] && iso_app_id='Manjaro Linux Live/Rescue CD'
 
-    [[ -z ${iso_compression} ]] && iso_compression='xz'
+    [[ -z ${sfs_compress} ]] && sfs_compress='xz'
 
-    [[ -z ${iso_checksum} ]] && iso_checksum='md5'
+    [[ -z ${sfs_checksum} ]] && sfs_checksum='md5'
 
     [[ -z ${initsys} ]] && initsys="systemd"