d-i apt-setup/use_mirror boolean true
 d-i mirror/protocol string http
 d-i mirror/http/proxy string 
+d-i mirror/http/countries select US
+d-i mirror/http/mirror select deb.debian.org
 #d-i mirror/http/hostname string http.us.debian.org
 d-i apt-setup/enable-source-repositories true
 d-i apt-setup/non-free-firmware boolean true
 
 echo "\nSetting up borg and pull in ~/org"
 cd "${PATH_SECRETS_BORGKEYS}"
 ls -1 | while read _FILENAME; do
-    "${NAME_BORGAPP}" claim "${_FILENAE}"
+    "${NAME_BORGAPP}" claim "${_FILENAME}"
 done
 cd -
 while true; do
 
 abort_if_illegal_system_name "${SYSTEM_NAME}"
 SYSTEM_CLASS_NAME="$(get_system_class_for ${SYSTEM_NAME})"
 TAG_ALL=all
-TAGS_USER="user desktop"
-MIN_TAGS="${TAG_ALL} ${SYSTEM_CLASS_NAME} ${SYSTEM_NAME}"
+MIN_TAGS="${TAG_ALL} ${SYSTEM_CLASS_NAME}"
+TAGS_USER="user desktop ${SYSTEM_NAME}"
 TAGS_PACKAGES="${MIN_TAGS} ${TAGS_USER}"
 
 upgrade_from_older_release() {