diff --git a/__frzr-deploy b/__frzr-deploy
index 2d74b29..1c0eb41 100644
--- a/__frzr-deploy
+++ b/__frzr-deploy
@@ -355,7 +355,13 @@ frzr_deploy() {
 						sleep 1;
 					done
 				elif [ "${SHOW_UI}" = "0" ]; then
-					curl --http1.1 -L -o "${IMG_FILE}" -C - "${IMG_URL}"
+					if ! curl --http1.1 -L -o "${IMG_FILE}" -C - "${IMG_URL}"; then
+						TASK_ERROR=1
+						TASK_ERROR_MSG="Download failed"
+						STATE="FAIL"
+						send_data
+						continue
+					fi
 				else
 					TASK_MSG="Using Whiptail to show download progress"
 					send_data
diff --git a/frzr b/frzr
index 23f04fe..1b4440d 100755
--- a/frzr
+++ b/frzr
@@ -23,8 +23,6 @@ frzr unlock (deployment) [Unlock the specified deployment, or the running one if
 frzr set-channel [Set the update channel stable/testing/unstable]
 frzr get-channel [Get the update channel currently in use]
 frzr version [Get the version of FRZR]
-frzr build-initramfs [Build the initramfs for the kernel]
-frzr configure-tweaks [Configure system specific quirks]
 frzr bootstrap [Format and configure a drive to be used with FRZR]
 
 [Environment]
@@ -268,10 +266,6 @@ elif [ $function == "get-channel" ]; then
 	echo "get-channel"
 	#TODO create frzr-channel to get target channel
 	#echo ${FRZR_ROOT}/source
-elif [ $function == "build-initramfs" ]; then
-	source frzr-initramfs
-elif [ $function == "configure-tweaks" ]; then
-	source frzr-tweaks
 elif [ $function == "package-options" ]; then
 	#User selected packages to be added to the install
 	source frzr-extras
diff --git a/frzr-autoupdate.service b/frzr-autoupdate.service
index 5655371..e7f3039 100644
--- a/frzr-autoupdate.service
+++ b/frzr-autoupdate.service
@@ -5,6 +5,7 @@ Wants=network-online.target
 
 [Service]
 Type=oneshot
-ExecStart=frzr-deploy
+Environment="SHOW_UI=0"
+ExecStart=frzr deploy
 RemainAfterExit=false
 StandardOutput=journal