diff --git a/functions/command_validate.sh b/functions/command_validate.sh
index 811f3d119..55c2e88e3 100644
--- a/functions/command_validate.sh
+++ b/functions/command_validate.sh
@@ -29,9 +29,9 @@ if [ $(command -v unbuffer) ]; then
 fi
 
 if [ "${engine}" == "goldsource" ]; then
-	${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid} -beta ${beta}" +app_update "${appid} -beta ${beta}" validate +quit|tee -a "${scriptlog}"
+	${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${game} +app_update "${appid}" -beta ${beta} +app_update "${appid}" -beta ${beta} validate +quit|tee -a "${scriptlog}"
 else
-	${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid} -beta ${beta}" validate +quit|tee -a "${scriptlog}"
+	${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" -beta ${beta} validate +quit|tee -a "${scriptlog}"
 fi
 
 fix.sh
diff --git a/functions/install_serverfiles.sh b/functions/install_serverfiles.sh
index 06d0a2340..1e1d7422b 100644
--- a/functions/install_serverfiles.sh
+++ b/functions/install_serverfiles.sh
@@ -37,15 +37,15 @@ while [ "${counter}" == "0" ]||[ "$(grep -wc 0x402 .finstall_serverfiles.sh.tmp)
 
 		if [ "${counter}" -le "4" ]; then
 			if [ "${engine}" == "goldsource" ]; then
-				${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid} -beta ${beta}" +quit |tee .finstall_serverfiles.sh.tmp
+				${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${game} +app_update "${appid}" -beta ${beta} +quit |tee .finstall_serverfiles.sh.tmp
 			else
-				${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid} -beta ${beta}" +quit |tee .finstall_serverfiles.sh.tmp
+				${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" -beta ${beta} +quit |tee .finstall_serverfiles.sh.tmp
 			fi
 		elif [ "${counter}" -ge "5" ]; then
 			if [ "${engine}" == "goldsource" ]; then
-				${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid} -beta ${beta}" -validate +quit |tee .finstall_serverfiles.sh.tmp
+				${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${game} +app_update "${appid}" -beta ${beta} -validate +quit |tee .finstall_serverfiles.sh.tmp
 			else
-				${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid} -beta ${beta}" -validate +quit |tee .finstall_serverfiles.sh.tmp
+				${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" -beta ${beta} -validate +quit |tee .finstall_serverfiles.sh.tmp
 			fi
 		fi
 	elif [ "${counter}" -ge "11" ]; then
@@ -61,7 +61,7 @@ if [ "${engine}" == "goldsource" ]; then
 	counter="0"
 	while [ "${counter}" -le "4" ]; do
 		counter=$((counter+1))
-		${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid} -beta ${beta}" -validate +quit |tee .finstall_serverfiles.sh.tmp
+		${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${game} +app_update "${appid}" -beta ${beta} -validate +quit |tee .finstall_serverfiles.sh.tmp
 	done
 fi
 rm -f .finstall_serverfiles.sh.tmp
diff --git a/functions/update_dl.sh b/functions/update_dl.sh
index 721aef956..510bf3363 100644
--- a/functions/update_dl.sh
+++ b/functions/update_dl.sh
@@ -19,9 +19,9 @@ if [ $(command -v unbuffer) ]; then
 fi
 
 if [ "${engine}" == "goldsource" ]; then
-	${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid} -beta ${beta}" +quit|tee -a "${scriptlog}"
+	${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${game} +app_update "${appid}" -beta ${beta} +quit|tee -a "${scriptlog}"
 else
-	${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid} -beta ${beta}" +quit|tee -a "${scriptlog}"
+	${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" -beta ${beta} +quit|tee -a "${scriptlog}"
 fi
 
 fix.sh