diff --git a/build-termux.sh b/build-termux.sh
index 299e0cb..85e63af 100755
--- a/build-termux.sh
+++ b/build-termux.sh
@@ -6,7 +6,7 @@ pr() { echo -e "\033[0;32m[+] ${1}\033[0m"; }
 ask() {
 	local y
 	for ((n = 0; n < 3; n++)); do
-		pr "$1"
+		pr "$1 [y/n]"
 		if read -r y; then
 			if [ "$y" = y ]; then
 				return 0
@@ -19,53 +19,65 @@ ask() {
 	return 1
 }
 
+pr "Ask for storage permission"
+until
+	yes | termux-setup-storage >/dev/null 2>&1
+	ls /sdcard >/dev/null 2>&1
+do sleep 1; done
 if [ ! -f ~/.rvmm_"$(date '+%Y%m')" ]; then
 	pr "Setting up environment..."
 	yes "" | pkg update -y && pkg install -y openssl git wget jq openjdk-17 zip
 	: >~/.rvmm_"$(date '+%Y%m')"
 fi
+mkdir -p /sdcard/Download/revanced-magisk-module/
 
-if [ -f build.sh ]; then cd ..; fi
-if [ -d revanced-magisk-module ]; then
+if [ ! -d revanced-magisk-module ]; then
+	pr "Cloning revanced-magisk-module."
+	git clone https://github.com/j-hc/revanced-magisk-module --depth 1
+	cd revanced-magisk-module
+	sed -i '/^enabled.*/d; /^\[.*\]/a enabled = false' config.toml
+	grep -q 'revanced-magisk-module' ~/.gitconfig 2>/dev/null \
+		|| git config --global --add safe.directory ~/revanced-magisk-module
+else
+	cd revanced-magisk-module
 	pr "Checking for revanced-magisk-module updates"
-	git -C revanced-magisk-module fetch
-	if git -C revanced-magisk-module status | grep -q 'is behind'; then
+	git fetch
+	if git status | grep -q 'is behind\|fatal'; then
 		pr "revanced-magisk-module already is not synced with upstream."
 		pr "Cloning revanced-magisk-module. config.toml will be preserved."
+		cd ..
 		cp -f revanced-magisk-module/config.toml .
 		rm -rf revanced-magisk-module
 		git clone https://github.com/j-hc/revanced-magisk-module --recurse --depth 1
 		mv -f config.toml revanced-magisk-module/config.toml
+		cd revanced-magisk-module
 	fi
-else
-	pr "Cloning revanced-magisk-module."
-	git clone https://github.com/j-hc/revanced-magisk-module --recurse --depth 1
-	sed -i '/^enabled.*/d; /^\[.*\]/a enabled = false' revanced-magisk-module/config.toml
 fi
-cd revanced-magisk-module
-chmod +x build.sh build-termux.sh
 
-if ask "Do you want to open the config.toml for customizations? [y/n]"; then
-	nano config.toml
-fi
-if ! ask "Setup is done. Do you want to start building? [y/n]"; then
-	exit 0
+[ -f ~/storage/downloads/revanced-magisk-module/config.toml ] \
+	|| cp config.toml ~/storage/downloads/revanced-magisk-module/config.toml
+
+if ask "Open rvmm-config-gen to generate a config?"; then
+	am start -a android.intent.action.VIEW -d https://j-hc.github.io/rvmm-config-gen/
 fi
+printf "\n"
+until
+	if ask "Open 'config.toml' to configure builds?\nAll are disabled by default, you will need to enable at first time building"; then
+		am start -a android.intent.action.VIEW -d file:///sdcard/Download/revanced-magisk-module/config.toml -t text/plain
+	fi
+	ask "Setup is done. Do you want to start building?"
+do :; done
+cp -f ~/storage/downloads/revanced-magisk-module/config.toml config.toml
+
 ./build.sh
 
 cd build
-pr "Ask for storage permission"
-until
-	yes | termux-setup-storage >/dev/null 2>&1
-	ls /sdcard >/dev/null 2>&1
-do
-	sleep 1
-done
-
 PWD=$(pwd)
-mkdir -p ~/storage/downloads/revanced-magisk-module
 for op in *; do
-	[ "$op" = "*" ] && continue
+	[ "$op" = "*" ] && {
+		pr "glob fail"
+		exit 1
+	}
 	mv -f "${PWD}/${op}" ~/storage/downloads/revanced-magisk-module/"${op}"
 done
 
diff --git a/build.sh b/build.sh
index 58b0a2c..d670895 100755
--- a/build.sh
+++ b/build.sh
@@ -49,6 +49,7 @@ jq --version >/dev/null || abort "\`jq\` is not installed. install it with 'apt
 java --version >/dev/null || abort "\`openjdk 17\` is not installed. install it with 'apt install openjdk-17-jre' or equivalent"
 zip --version >/dev/null || abort "\`zip\` is not installed. install it with 'apt install zip' or equivalent"
 # ----------------
+rm -rf revanced-magisk/bin/*/tmp.*
 get_prebuilts
 
 set_prebuilts() {
@@ -72,7 +73,10 @@ for table_name in $(toml_get_table_names); do
 	t=$(toml_get_table "$table_name")
 	enabled=$(toml_get "$t" enabled) && vtf "$enabled" "enabled" || enabled=true
 	if [ "$enabled" = false ]; then continue; fi
-	if ((idx >= PARALLEL_JOBS)); then wait -n; fi
+	if ((idx >= PARALLEL_JOBS)); then
+		wait -n
+		idx=$((idx - 1))
+	fi
 
 	declare -A app_args
 	patches_src=$(toml_get "$t" patches-source) || patches_src=$DEF_PATCHES_SRC
@@ -145,18 +149,28 @@ for table_name in $(toml_get_table_names); do
 	app_args[dpi]=$(toml_get "$t" apkmirror-dpi) || app_args[dpi]="nodpi"
 	table_name_f=${table_name,,}
 	table_name_f=${table_name_f// /-}
-	app_args[module_prop_name]=$(toml_get "$t" module-prop-name) || app_args[module_prop_name]="${table_name_f}-jhc"
+	app_args[module_prop_name]=$(toml_get "$t" module-prop-name) || {
+		app_args[module_prop_name]="${table_name_f}-jhc"
+		if [ "${app_args[arch]}" = "arm64-v8a" ]; then
+			app_args[module_prop_name]="${app_args[module_prop_name]}-arm64"
+		elif [ "${app_args[arch]}" = "arm-v7a" ]; then
+			app_args[module_prop_name]="${app_args[module_prop_name]}-arm"
+		fi
+	}
 
 	if [ "${app_args[arch]}" = both ]; then
 		app_args[table]="$table_name (arm64-v8a)"
-		app_args[module_prop_name]="${app_args[module_prop_name]}-arm64"
 		app_args[arch]="arm64-v8a"
+		app_args[module_prop_name]="${app_args[module_prop_name]}-arm64"
 		idx=$((idx + 1))
 		build_rv "$(declare -p app_args)" &
 		app_args[table]="$table_name (arm-v7a)"
-		app_args[module_prop_name]="${app_args[module_prop_name]}-arm"
 		app_args[arch]="arm-v7a"
-		if ((idx >= PARALLEL_JOBS)); then wait -n; fi
+		app_args[module_prop_name]="${app_args[module_prop_name]}-arm"
+		if ((idx >= PARALLEL_JOBS)); then
+			wait -n
+			idx=$((idx - 1))
+		fi
 		idx=$((idx + 1))
 		build_rv "$(declare -p app_args)" &
 	else
diff --git a/revanced-magisk/customize.sh b/revanced-magisk/customize.sh
index 37838cc..1e00b9d 100755
--- a/revanced-magisk/customize.sh
+++ b/revanced-magisk/customize.sh
@@ -1,29 +1,28 @@
-# shellcheck disable=SC2148,SC2086,SC1091
-. $MODPATH/config
+. "$MODPATH/config"
 
 ui_print ""
-if [ -n "$MODULE_ARCH" ] && [ $MODULE_ARCH != $ARCH ]; then
+if [ -n "$MODULE_ARCH" ] && [ "$MODULE_ARCH" != "$ARCH" ]; then
 	abort "ERROR: Wrong arch
 Your device: $ARCH
 Module: $MODULE_ARCH"
 fi
 
-if [ $ARCH = "arm" ]; then
+if [ "$ARCH" = "arm" ]; then
 	ARCH_LIB=armeabi-v7a
 	alias cmpr='$MODPATH/bin/arm/cmpr'
-elif [ $ARCH = "arm64" ]; then
+elif [ "$ARCH" = "arm64" ]; then
 	ARCH_LIB=arm64-v8a
 	alias cmpr='$MODPATH/bin/arm64/cmpr'
-elif [ $ARCH = "x86" ]; then
+elif [ "$ARCH" = "x86" ]; then
 	ARCH_LIB=x86
 	alias cmpr='$MODPATH/bin/x86/cmpr'
-elif [ $ARCH = "x64" ]; then
+elif [ "$ARCH" = "x64" ]; then
 	ARCH_LIB=x86_64
 	alias cmpr='$MODPATH/bin/x64/cmpr'
 else
 	abort "ERROR: unsupported arch: ${ARCH}"
 fi
-set_perm_recursive $MODPATH/bin 0 0 0755 0777
+set_perm_recursive "$MODPATH/bin" 0 0 0755 0777
 
 if su -M -c true >/dev/null 2>/dev/null; then
 	alias mm='su -M -c'
@@ -31,28 +30,25 @@ else
 	alias mm='nsenter -t1 -m'
 fi
 
-mm grep $PKG_NAME /proc/mounts | while read -r line; do
+mm grep "$PKG_NAME" /proc/mounts | while read -r line; do
 	ui_print "* Un-mount"
-	mp=${line#* }
-	mp=${mp%% *}
-	mm umount -l ${mp%%\\*}
+	mp=${line#* } mp=${mp%% *}
+	mm umount -l "${mp%%\\*}"
 done
-am force-stop $PKG_NAME
+am force-stop "$PKG_NAME"
 
 INS=true
-if BASEPATH=$(pm path $PKG_NAME); then
-	BASEPATH=${BASEPATH##*:}
-	BASEPATH=${BASEPATH%/*}
-	if [ ${BASEPATH:1:6} = system ]; then
+if BASEPATH=$(pm path "$PKG_NAME"); then
+	BASEPATH=${BASEPATH##*:} BASEPATH=${BASEPATH%/*}
+	if [ "${BASEPATH:1:6}" = system ]; then
 		ui_print "* $PKG_NAME is a system app"
-	elif [ ! -d ${BASEPATH}/lib ]; then
+	elif [ ! -d "${BASEPATH}/lib" ]; then
 		ui_print "* Invalid installation found. Uninstalling..."
-		pm uninstall -k --user 0 $PKG_NAME
-	elif [ ! -f $MODPATH/$PKG_NAME.apk ]; then
+		pm uninstall -k --user 0 "$PKG_NAME"
+	elif [ ! -f "$MODPATH/$PKG_NAME.apk" ]; then
 		ui_print "* Stock $PKG_NAME APK was not found"
-		VERSION=$(dumpsys package $PKG_NAME | grep -m1 versionName)
-		VERSION="${VERSION#*=}"
-		if [ "$VERSION" = $PKG_VER ] || [ -z "$VERSION" ]; then
+		VERSION=$(dumpsys package "$PKG_NAME" | grep -m1 versionName) VERSION="${VERSION#*=}"
+		if [ "$VERSION" = "$PKG_VER" ] || [ -z "$VERSION" ]; then
 			ui_print "* Skipping stock installation"
 			INS=false
 		else
@@ -61,25 +57,24 @@ if BASEPATH=$(pm path $PKG_NAME); then
 			module:    $PKG_VER
 			"
 		fi
-	elif cmpr $BASEPATH/base.apk $MODPATH/$PKG_NAME.apk; then
+	elif cmpr "$BASEPATH/base.apk" "$MODPATH/$PKG_NAME.apk"; then
 		ui_print "* $PKG_NAME is up-to-date"
 		INS=false
 	fi
 fi
 
 install() {
-	if [ ! -f $MODPATH/$PKG_NAME.apk ]; then
+	if [ ! -f "$MODPATH/$PKG_NAME.apk" ]; then
 		abort "ERROR: Stock $PKG_NAME apk was not found"
 	fi
 	ui_print "* Updating $PKG_NAME to $PKG_VER"
 	settings put global verifier_verify_adb_installs 0
-	SZ=$(stat -c "%s" $MODPATH/$PKG_NAME.apk)
+	SZ=$(stat -c "%s" "$MODPATH/$PKG_NAME.apk")
 	if ! SES=$(pm install-create --user 0 -i com.android.vending -r -d -S "$SZ" 2>&1); then
 		ui_print "ERROR: install-create failed"
 		abort "$SES"
 	fi
-	SES=${SES#*[}
-	SES=${SES%]*}
+	SES=${SES#*[} SES=${SES%]*}
 	set_perm "$MODPATH/$PKG_NAME.apk" 1000 1000 644 u:object_r:apk_data_file:s0
 	if ! op=$(pm install-write -S "$SZ" "$SES" "$PKG_NAME.apk" "$MODPATH/$PKG_NAME.apk" 2>&1); then
 		ui_print "ERROR: install-write failed"
@@ -88,16 +83,15 @@ install() {
 	if ! op=$(pm install-commit "$SES" 2>&1); then
 		if echo "$op" | grep -q INSTALL_FAILED_VERSION_DOWNGRADE; then
 			ui_print "* INSTALL_FAILED_VERSION_DOWNGRADE. Uninstalling..."
-			pm uninstall -k --user 0 $PKG_NAME
+			pm uninstall -k --user 0 "$PKG_NAME"
 			return 1
 		fi
 		ui_print "ERROR: install-commit failed"
 		abort "$op"
 	fi
 	settings put global verifier_verify_adb_installs 1
-	if BASEPATH=$(pm path $PKG_NAME); then
-		BASEPATH=${BASEPATH##*:}
-		BASEPATH=${BASEPATH%/*}
+	if BASEPATH=$(pm path "$PKG_NAME"); then
+		BASEPATH=${BASEPATH##*:} BASEPATH=${BASEPATH%/*}
 	else
 		abort "ERROR: install $PKG_NAME manually and reflash the module"
 	fi
@@ -111,36 +105,36 @@ if [ $INS = true ]; then
 fi
 
 BASEPATHLIB=${BASEPATH}/lib/${ARCH}
-if [ -z "$(ls -A1 ${BASEPATHLIB})" ]; then
+if [ -z "$(ls -A1 "$BASEPATHLIB")" ]; then
 	ui_print "* Extracting native libs"
-	mkdir -p $BASEPATHLIB
-	if ! op=$(unzip -j $MODPATH/$PKG_NAME.apk lib/${ARCH_LIB}/* -d ${BASEPATHLIB} 2>&1); then
+	mkdir -p "$BASEPATHLIB"
+	if ! op=$(unzip -j "$MODPATH"/"$PKG_NAME".apk lib/"${ARCH_LIB}"/* -d "$BASEPATHLIB" 2>&1); then
 		ui_print "ERROR: extracting native libs failed"
 		abort "$op"
 	fi
-	set_perm_recursive ${BASEPATH}/lib 1000 1000 755 755 u:object_r:apk_data_file:s0
+	set_perm_recursive "${BASEPATH}/lib" 1000 1000 755 755 u:object_r:apk_data_file:s0
 fi
 ui_print "* Setting Permissions"
-set_perm $MODPATH/base.apk 1000 1000 644 u:object_r:apk_data_file:s0
+set_perm "$MODPATH/base.apk" 1000 1000 644 u:object_r:apk_data_file:s0
 
 ui_print "* Mounting $PKG_NAME"
-mkdir -p $NVBASE/rvhc
+mkdir -p "$NVBASE/rvhc"
 RVPATH=$NVBASE/rvhc/${MODPATH##*/}.apk
-mv -f $MODPATH/base.apk $RVPATH
+mv -f "$MODPATH/base.apk" "$RVPATH"
 
-if ! op=$(mm mount -o bind $RVPATH $BASEPATH/base.apk 2>&1); then
+if ! op=$(mm mount -o bind "$RVPATH" "$BASEPATH/base.apk" 2>&1); then
 	ui_print "ERROR: Mount failed!"
 	ui_print "$op"
 fi
-am force-stop $PKG_NAME
+am force-stop "$PKG_NAME"
 ui_print "* Optimizing $PKG_NAME"
-nohup cmd package compile --reset $PKG_NAME >/dev/null 2>&1 &
+nohup cmd package compile --reset "$PKG_NAME" >/dev/null 2>&1 &
 
 ui_print "* Cleanup"
-rm -rf ${MODPATH:?}/bin $MODPATH/$PKG_NAME.apk
+rm -rf "${MODPATH:?}/bin" "$MODPATH/$PKG_NAME.apk"
 
 for s in "uninstall.sh" "service.sh"; do
-	sed -i "2 i\NVBASE=${NVBASE}" $MODPATH/$s
+	sed -i "2 i\NVBASE=${NVBASE}" "$MODPATH/$s"
 done
 
 ui_print "* Done"
diff --git a/revanced-magisk/service.sh b/revanced-magisk/service.sh
index a241f3b..974c75d 100755
--- a/revanced-magisk/service.sh
+++ b/revanced-magisk/service.sh
@@ -1,48 +1,44 @@
 #!/system/bin/sh
-# shellcheck disable=SC2086,SC1091
 MODDIR=${0%/*}
 RVPATH=$NVBASE/rvhc/${MODDIR##*/}.apk
-. $MODDIR/config
+. "$MODDIR/config"
 
 until [ "$(getprop sys.boot_completed)" = 1 ]; do sleep 1; done
 until [ -d "/sdcard/Android" ]; do sleep 1; done
 while
-	BASEPATH=$(pm path $PKG_NAME)
+	BASEPATH=$(pm path "$PKG_NAME")
 	svcl=$?
 	[ $svcl = 20 ]
 do sleep 2; done
 sleep 5
 
 err() {
-	[ ! -f $MODDIR/err ] && cp $MODDIR/module.prop $MODDIR/err
-	sed -i "s/^des.*/description=⚠️ Needs reflash: '${1}'/g" $MODDIR/module.prop
+	[ ! -f "$MODDIR/err" ] && cp "$MODDIR/module.prop" "$MODDIR/err"
+	sed -i "s/^des.*/description=⚠️ Needs reflash: '${1}'/g" "$MODDIR/module.prop"
 }
 
-if [ $svcl = 0 ]; then
-	BASEPATH=${BASEPATH##*:}
-	BASEPATH=${BASEPATH%/*}
-	if [ -d $BASEPATH/lib ]; then
-		VERSION=$(dumpsys package $PKG_NAME | grep -m1 versionName)
-		VERSION="${VERSION#*=}"
-		if [ "$VERSION" = $PKG_VER ] || [ -z "$VERSION" ]; then
-			grep $PKG_NAME /proc/mounts | while read -r line; do
-				mp=${line#* }
-				mp=${mp%% *}
-				umount -l ${mp%%\\*}
-			done
-			if chcon u:object_r:apk_data_file:s0 $RVPATH; then
-				mount -o bind $RVPATH $BASEPATH/base.apk
-				am force-stop $PKG_NAME
-				[ -f $MODDIR/err ] && mv -f $MODDIR/err $MODDIR/module.prop
-			else
-				err "mount failed"
-			fi
-		else
-			err "version mismatch (installed:${VERSION}, module:$PKG_VER)"
-		fi
-	else
-		err "zygote crashed"
-	fi
-else
+if [ $svcl != 0 ]; then
 	err "app not installed"
+	exit
 fi
+BASEPATH=${BASEPATH##*:} BASEPATH=${BASEPATH%/*}
+if [ ! -d "$BASEPATH/lib" ]; then
+	err "zygote crashed (fix your ROM)"
+	exit
+fi
+VERSION=$(dumpsys package "$PKG_NAME" | grep -m1 versionName) VERSION="${VERSION#*=}"
+if [ "$VERSION" != "$PKG_VER" ] && [ "$VERSION" ]; then
+	err "version mismatch (installed:${VERSION}, module:$PKG_VER)"
+	exit
+fi
+grep "$PKG_NAME" /proc/mounts | while read -r line; do
+	mp=${line#* } mp=${mp%% *}
+	umount -l "${mp%%\\*}"
+done
+if ! chcon u:object_r:apk_data_file:s0 "$RVPATH"; then
+	err "apk not found"
+	exit
+fi
+mount -o bind "$RVPATH" "$BASEPATH/base.apk"
+am force-stop "$PKG_NAME"
+[ -f "$MODDIR/err" ] && mv -f "$MODDIR/err" "$MODDIR/module.prop"
diff --git a/utils.sh b/utils.sh
index cb111f2..90bd20c 100755
--- a/utils.sh
+++ b/utils.sh
@@ -435,7 +435,6 @@ build_rv() {
 				elif [ "$arch" = "arm-v7a" ]; then
 					patcher_args+=("--rip-lib arm64-v8a")
 				fi
-
 			fi
 		fi
 		if [ ! -f "$patched_apk" ] || [ "$REBUILD" = true ]; then