diff --git a/lib/util-iso-calamares.sh b/lib/util-iso-calamares.sh
index 41c78a6..ff7774e 100644
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@@ -52,10 +52,10 @@ write_bootloader_conf(){
 }
 
 write_services_conf(){
-	local conf="$1/etc/calamares/modules/services.conf"
-	echo '---' >  "$conf"
-	echo '' >> "$conf"
 	if [[ ${initsys} == 'openrc' ]];then
+		local conf="$1/etc/calamares/modules/servicescfg.conf"
+		echo '---' >  "$conf"
+		echo '' >> "$conf"
 		echo 'services:' >> "$conf"
 		echo '    enabled:' >> "$conf"
 		for s in ${enable_openrc[@]};do
@@ -71,6 +71,9 @@ write_services_conf(){
 			done
 		fi
 	else
+		local conf="$1/etc/calamares/modules/services.conf"
+		echo '---' >  "$conf"
+		echo '' >> "$conf"
 		echo 'services:' > "$conf"
 		for s in ${enable_systemd[@]};do
 			echo '    - name: '"$s" >> "$conf"
@@ -210,7 +213,7 @@ write_settings_conf(){
 	echo "  - initcpio" >> "$conf"
 	echo "  - users" >> "$conf"
 	echo "  - displaymanager" >> "$conf"
-	echo "  - hardwarecfg" >> "$conf"
+	echo "  - mhwdcfg" >> "$conf"
 	echo "  - networkcfg" >> "$conf"
 	echo "  - hwclock" >> "$conf"
 	if [[ ${initsys} == 'systemd' ]];then
@@ -232,6 +235,43 @@ write_settings_conf(){
 	echo "dont-chroot: false" >> "$conf"
 }
 
+write_mhwdcfg_conf(){
+	local conf="$1/etc/calamares/modules/mhwdcfg.conf"
+	echo "---" > "$conf"
+	echo "bus_types:" >> "$conf"
+	echo "    - pci" >> "$conf"
+	echo "    - usb" >> "$conf"
+	echo '' >> "$conf"
+	echo "identifiers:" >> "$conf"
+	echo "    net:" >> "$conf"
+	echo "      - '0200'" >> "$conf"
+	echo "      - '0280'" >> "$conf"
+	echo "    vid:" >> "$conf"
+	echo "      - '0300'" >> "$conf"
+	echo '' >> "$conf"
+	if ${cal_netinstall};then
+		if ${cal_unpackfs};then
+			echo "local_repo: true" >> "$conf"
+		else
+			echo "local_repo: false" >> "$conf"
+		fi
+	else
+		echo "local_repo: true" >> "$conf"
+	fi
+	echo '' >> "$conf"
+	echo "repo_conf: /opt/live/pacman-gfx.conf" >> "$conf"
+
+	if ${cal_netinstall};then
+		if ${cal_unpackfs};then
+			echo "local_repo: true" >> "$conf"
+		else
+			echo "local_repo: false" >> "$conf"
+		fi
+	else
+		echo "local_repo: true" >> "$conf"
+	fi
+}
+
 write_chrootcfg_conf(){
 	local conf="$1/etc/calamares/modules/chrootcfg.conf" mode='"0o755"'
 	echo "---" > "$conf"
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 7828392..b66b16a 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -172,7 +172,7 @@ make_iso() {
 make_checksum(){
 	msg "Creating [%s] sum ..." "${iso_checksum}"
 	local cs=$(${iso_checksum}sum ${iso_dir}/$1)
-	msg2 "%s sum: %s" "${iso_checksum}" "${cs}"
+	msg2 "%s sum: %s" "${iso_checksum}" "${cs##*/}"
 	echo "${cs}" > ${iso_dir}/$1.${iso_checksum}
 	msg "Done [%s] sum" "${iso_checksum}"
 }