diff --git a/.gitignore b/.gitignore
index ec91fd6..d509d0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 deploy/*
 work/*
+.vscode/*
+
 config
 SKIP
 .pc
diff --git a/README.md b/README.md
index 74d54f9..4db8cad 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,25 @@
 #TODO
 
-1. Image export
-1. NOOBS export
-1. Simplify running a single stage
-1. Documentation
+- NOOBS export
+- Simplify running a single stage
+- Documentation
 
 #Dependencies
-
 `quilt kpartx realpath qemu-user-static debootstrap zerofree`
+
+# Example build script:
+
+```bash
+#!/bin/bash -e
+
+# Set build variables
+USERNAME=pi
+PASSWORD=raspberry
+HOSTNAME=raspberrypi
+IMAGENAME="raspbian-lite-$(date +%Y-%m-%d)"
+
+# Build rootfs
+sudo ./build.sh --username=${USERNAME} --password=${PASSWORD} --hostname=${HOSTNAME} --imagename=${IMAGENAME}
+
+# Resulting images will be in deploy/
+```
\ No newline at end of file
diff --git a/build.sh b/build.sh
index fe8214a..048478c 100755
--- a/build.sh
+++ b/build.sh
@@ -1,10 +1,19 @@
 #!/bin/bash -e
 
+##---------------------------
+## Functions
+##---------------------------
+
 run_sub_stage()
 {
 	log "Begin ${SUB_STAGE_DIR}"
+
 	pushd ${SUB_STAGE_DIR} > /dev/null
+	
+	# Loop through each substage
 	for i in {00..99}; do
+	
+		# Check for debconf stage
 		if [ -f ${i}-debconf ]; then
 			log "Begin ${SUB_STAGE_DIR}/${i}-debconf"
 			on_chroot sh -e - << EOF
@@ -14,6 +23,8 @@ SELEOF
 EOF
 		log "End ${SUB_STAGE_DIR}/${i}-debconf"
 		fi
+		
+		# Install any packages with no-install-recommends set
 		if [ -f ${i}-packages-nr ]; then
 			log "Begin ${SUB_STAGE_DIR}/${i}-packages-nr"
 			PACKAGES=`cat $i-packages-nr | tr '\n' ' '`
@@ -24,6 +35,8 @@ EOF
 			fi
 			log "End ${SUB_STAGE_DIR}/${i}-packages-nr"
 		fi
+		
+		# Install any packages normally
 		if [ -f ${i}-packages ]; then
 			log "Begin ${SUB_STAGE_DIR}/${i}-packages"
 			PACKAGES=`cat $i-packages | tr '\n' ' '`
@@ -34,6 +47,8 @@ EOF
 			fi
 			log "End ${SUB_STAGE_DIR}/${i}-packages"
 		fi
+		
+		# Apply any patches
 		if [ -d ${i}-patches ]; then
 			log "Begin ${SUB_STAGE_DIR}/${i}-patches"
 			pushd ${STAGE_WORK_DIR} > /dev/null
@@ -61,11 +76,15 @@ EOF
 			popd > /dev/null
 			log "End ${SUB_STAGE_DIR}/${i}-patches"
 		fi
+		
+		# Run the substages run script
 		if [ -x ${i}-run.sh ]; then
 			log "Begin ${SUB_STAGE_DIR}/${i}-run.sh"
 			./${i}-run.sh
 			log "End ${SUB_STAGE_DIR}/${i}-run.sh"
 		fi
+		
+		# Run the substages chroot script
 		if [ -f ${i}-run-chroot ]; then
 			log "Begin ${SUB_STAGE_DIR}/${i}-run-chroot"
 			on_chroot sh -e - < ${i}-run-chroot
@@ -78,25 +97,42 @@ EOF
 
 run_stage(){
 	log "Begin ${STAGE_DIR}"
+
 	STAGE=$(basename ${STAGE_DIR})
+	
 	pushd ${STAGE_DIR} > /dev/null
+	
+	# Unmount this stage's folder on the filesystem
 	unmount ${WORK_DIR}/${STAGE}
+	
+	# Set the working directory for this stage
 	STAGE_WORK_DIR=${WORK_DIR}/${STAGE}
+	
+	# Set the root directory for this stage
 	ROOTFS_DIR=${STAGE_WORK_DIR}/rootfs
+
 	if [ -f ${STAGE_DIR}/EXPORT_IMAGE ]; then
 		EXPORT_DIRS="${EXPORT_DIRS} ${STAGE_DIR}"
 	fi
+	
+	# Check to see if we should skip this stage (seemingly never)
 	if [ ! -f SKIP ]; then
+	
+		# Clean the rootfs, if requested
 		if [ "${CLEAN}" = "1" ]; then
 			if [ -d ${ROOTFS_DIR} ]; then
 				rm -rf ${ROOTFS_DIR}
 			fi
 		fi
+		
+		# Run the pre-run script
 		if [ -x prerun.sh ]; then
 			log "Begin ${STAGE_DIR}/prerun.sh"
 			./prerun.sh
 			log "End ${STAGE_DIR}/prerun.sh"
 		fi
+		
+		# For each substage, run the run_sub_stage command for it
 		for SUB_STAGE_DIR in ${STAGE_DIR}/*; do
 			if [ -d ${SUB_STAGE_DIR} ] &&
 			   [ ! -f ${SUB_STAGE_DIR}/SKIP ]; then
@@ -104,38 +140,108 @@ run_stage(){
 			fi
 		done
 	fi
+	
+	# Unmount the stag again
 	unmount ${WORK_DIR}/${STAGE}
+	
+	# Set the previous stage info to this stage for the next stage to use
 	PREV_STAGE=${STAGE}
 	PREV_STAGE_DIR=${STAGE_DIR}
 	PREV_ROOTFS_DIR=${ROOTFS_DIR}
+	
 	popd > /dev/null
+	
 	log "End ${STAGE_DIR}"
 }
 
+
+
+##---------------------------
+## Start Build
+##---------------------------
+
+# Require Root to run
 if [ "$(id -u)" != "0" ]; then
 	echo "Please run as root" 1>&2
 	exit 1
 fi
 
+# Handle input options
+for i in "$@"
+do
+case $i in
+
+    --imagename=*)      
+    IMG_NAME="${i#*=}"
+    shift
+    ;;
+
+    # Username to use in rootfs
+    --username=*)      
+    USER_NAME="${i#*=}"
+    shift
+    ;;
+	
+	# Hostname to use in rootfs
+    --password=*)      
+    PASS_WORD="${i#*=}"
+    shift
+    ;;
+    
+    # Hostname to use in rootfs
+    --hostname=*)      
+    HOST_NAME="${i#*=}"
+    shift
+    ;;
+    
+    # unknown option
+    *)        
+    ;;
+esac
+done
+
+if [ -z "${IMG_NAME}" ]; 
+then
+	echo "No image name specified, defaulting to \"raspbian\""
+	IMG_NAME="raspbian"
+fi
+
+if [ -z "$USER_NAME" ]
+then
+  echo "No username specified, defaulting to \"pi\""
+  USER_NAME="pi"
+fi
+
+if [ -z "$PASS_WORD" ]
+then
+  echo "No username specified, defaulting to \"raspberry\""
+  PASS_WORD="raspberry"
+fi
+
+if [ -z "$HOST_NAME" ]
+then
+  echo "No hostname specified, defaulting to \"raspberrypi\""
+  HOST_NAME="raspberrypi"
+fi
+
+# Source a config file if it exists
 if [ -f config ]; then
 	source config
 fi
 
-if [ -z "${IMG_NAME}" ]; then
-	echo "IMG_NAME not set" 1>&2
-	exit 1
-fi
-
-export IMG_DATE=${IMG_DATE:-"$(date -u +%Y-%m-%d)"}
+# Set and export other env variables
+export USER_NAME
+export HOST_NAME
+export PASS_WORD
+export IMG_NAME
 
 export BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 export SCRIPT_DIR="${BASE_DIR}/scripts"
-export WORK_DIR="${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"
+export WORK_DIR="${BASE_DIR}/work/${IMG_NAME}"
 export DEPLOY_DIR="${BASE_DIR}/deploy"
 export LOG_FILE="${WORK_DIR}/build.log"
 
 export CLEAN
-export IMG_NAME
 export APT_PROXY
 
 export STAGE
@@ -156,9 +262,11 @@ export QUILT_REFRESH_ARGS="-p ab"
 
 source ${SCRIPT_DIR}/common
 
+# Create working directory
 mkdir -p ${WORK_DIR}
 log "Begin ${BASE_DIR}"
 
+# Successively build each stage
 for STAGE_DIR in ${BASE_DIR}/stage*; do
 	run_stage
 done
diff --git a/export-image/03-finalise/01-run.sh b/export-image/03-finalise/01-run.sh
index 0ffe1e6..d4487b6 100755
--- a/export-image/03-finalise/01-run.sh
+++ b/export-image/03-finalise/01-run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
+IMG_FILE="${STAGE_WORK_DIR}/${IMG_NAME}${IMG_SUFFIX}.img"
 
 on_chroot sh -e - <<EOF
 /etc/init.d/fake-hwclock stop
@@ -27,9 +27,9 @@ unmount_image ${IMG_FILE}
 
 mkdir -p ${DEPLOY_DIR}
 
-rm -f ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip
+rm -f ${DEPLOY_DIR}/${IMG_NAME}${IMG_SUFFIX}.zip
 
-echo zip ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip ${IMG_FILE}
+echo zip ${DEPLOY_DIR}/${IMG_NAME}${IMG_SUFFIX}.zip ${IMG_FILE}
 pushd ${STAGE_WORK_DIR} > /dev/null
-zip ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip $(basename ${IMG_FILE})
+zip ${DEPLOY_DIR}/${IMG_NAME}${IMG_SUFFIX}.zip $(basename ${IMG_FILE})
 popd > /dev/null
diff --git a/export-image/prerun.sh b/export-image/prerun.sh
index aaf9bfa..fc52e33 100755
--- a/export-image/prerun.sh
+++ b/export-image/prerun.sh
@@ -1,11 +1,15 @@
 #!/bin/bash -e
-IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
+IMG_FILE="${STAGE_WORK_DIR}/${IMG_NAME}${IMG_SUFFIX}.img"
 
+echo "Doing cleanup first"
 unmount_image ${IMG_FILE}
 
 rm -f ${IMG_FILE}
 
 rm -rf ${ROOTFS_DIR}
+
+echo "Cleanup done"
+
 mkdir -p ${ROOTFS_DIR}
 
 BOOT_SIZE=$(du -sh ${EXPORT_ROOTFS_DIR}/boot -B M | cut -f 1 | tr -d M)
diff --git a/scripts/common b/scripts/common
index 6db58e2..6e97191 100644
--- a/scripts/common
+++ b/scripts/common
@@ -84,6 +84,11 @@ on_chroot() {
 }
 export -f on_chroot
 
+# This should be used if building on a system that uses systemd (?)
+on_chroot2() {
+	systemd-nspawn -D ${ROOTFS_DIR}/ "$@"
+}
+
 update_issue() {
 	local GIT_HASH=$(git rev-parse HEAD)
 	echo -e "Raspberry Pi reference ${IMG_DATE}\nGenerated using pi-gen, https://github.com/RPi-Distro/pi-gen, ${GIT_HASH}, ${1}" > ${ROOTFS_DIR}/etc/rpi-issue
diff --git a/stage0/01-configure-apt/00-run.sh b/stage0/01-configure-apt/00-run.sh
index 9b2bd2e..53c6fc5 100755
--- a/stage0/01-configure-apt/00-run.sh
+++ b/stage0/01-configure-apt/00-run.sh
@@ -1,8 +1,10 @@
 #!/bin/bash -e
 
+# Install source lists
 install -m 644 files/sources.list ${ROOTFS_DIR}/etc/apt/
 install -m 644 files/raspi.list ${ROOTFS_DIR}/etc/apt/sources.list.d/
 
+# Set up proxy, if it exists
 if [ -n "$APT_PROXY" ]; then
 	install -m 644 files/51cache ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache
 	sed ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache -i -e "s|APT_PROXY|${APT_PROXY}|"
@@ -10,8 +12,13 @@ else
 	rm -f ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache
 fi
 
+# Add the raspberry pi gpg key
 on_chroot apt-key add - < files/raspberrypi.gpg.key
-on_chroot sh -e - << EOF
+
+# Update and dist upgrade
+on_chroot sh -e - <<EOF
+
 apt-get update
 apt-get dist-upgrade -y
+
 EOF
diff --git a/stage1/01-sys-tweaks/00-run.sh b/stage1/01-sys-tweaks/00-run.sh
index d710e5b..f6f118e 100755
--- a/stage1/01-sys-tweaks/00-run.sh
+++ b/stage1/01-sys-tweaks/00-run.sh
@@ -2,14 +2,14 @@
 
 install -d ${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d
 install -m 644 files/noclear.conf ${ROOTFS_DIR}/etc/systemd/system/getty@tty1.service.d/noclear.conf
-install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/policy-rc.d #TODO: Necessary in systemd?
+install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/policy-rc.d
 install -v -m 644 files/fstab ${ROOTFS_DIR}/etc/fstab
 
 on_chroot sh -e - <<EOF
-if ! id -u pi >/dev/null 2>&1; then
-	adduser --disabled-password --gecos "" pi
+if ! id -u ${USER_NAME} >/dev/null 2>&1; then
+	adduser --disabled-password --gecos "" ${USER_NAME}
 fi
-echo "pi:raspberry" | chpasswd
+echo "${USER_NAME}:${PASS_WORD}" | chpasswd
 echo "root:root" | chpasswd
 EOF
 
diff --git a/stage1/01-sys-tweaks/files/fstab b/stage1/01-sys-tweaks/files/fstab
index 68e5816..3024bcf 100644
--- a/stage1/01-sys-tweaks/files/fstab
+++ b/stage1/01-sys-tweaks/files/fstab
@@ -1,3 +1,5 @@
 proc            /proc           proc    defaults          0       0
-/dev/mmcblk0p1  /boot           vfat    defaults          0       2
+/dev/mmcblk0p1  /boot           vfat    defaults,noatime  0       2
 /dev/mmcblk0p2  /               ext4    defaults,noatime  0       1
+tmpfs 			/tmp  			tmpfs 	defaults,noatime,nodev,nosuid,mode=1777				0 0
+tmpfs 			/var/log 		tmpfs 	defaults,size=20m,noatime,nodev,nosuid,mode=1777	0 0
\ No newline at end of file
diff --git a/stage1/02-net-tweaks/00-patches/01-hosts.diff b/stage1/02-net-tweaks/00-patches/01-hosts.diff
deleted file mode 100644
index ad07ae5..0000000
--- a/stage1/02-net-tweaks/00-patches/01-hosts.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: jessie-stage1/rootfs/etc/hosts
-===================================================================
---- jessie-stage1.orig/rootfs/etc/hosts
-+++ jessie-stage1/rootfs/etc/hosts
-@@ -3,3 +3,4 @@
- ff02::1		ip6-allnodes
- ff02::2		ip6-allrouters
- 
-+127.0.1.1	raspberrypi
diff --git a/stage1/02-net-tweaks/00-patches/series b/stage1/02-net-tweaks/00-patches/series
deleted file mode 100644
index 5299ca1..0000000
--- a/stage1/02-net-tweaks/00-patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01-hosts.diff
-02-persistant-net.diff
diff --git a/stage1/02-net-tweaks/00-run.sh b/stage1/02-net-tweaks/00-run.sh
index fd6609a..3649d7b 100755
--- a/stage1/02-net-tweaks/00-run.sh
+++ b/stage1/02-net-tweaks/00-run.sh
@@ -2,8 +2,17 @@
 
 install -m 644 files/ipv6.conf ${ROOTFS_DIR}/etc/modprobe.d/ipv6.conf
 install -m 644 files/interfaces ${ROOTFS_DIR}/etc/network/interfaces
-install -m 644 files/hostname ${ROOTFS_DIR}/etc/hostname
 
-on_chroot sh -e - << EOF
+cat <<EOF > ${ROOTFS_DIR}/etc/hostname
+${HOST_NAME}
+EOF
+
+# Append hostname
+cat <<EOF >> ${ROOTFS_DIR}/etc/hosts
+
+127.0.1.1	${HOST_NAME}
+EOF
+
+on_chroot sh -e - <<EOF
 dpkg-divert --add --local /lib/udev/rules.d/75-persistent-net-generator.rules
 EOF
diff --git a/stage1/02-net-tweaks/00-patches/02-persistant-net.diff b/stage1/02-net-tweaks/01-patches/01-persistant-net.diff
similarity index 100%
rename from stage1/02-net-tweaks/00-patches/02-persistant-net.diff
rename to stage1/02-net-tweaks/01-patches/01-persistant-net.diff
diff --git a/stage1/02-net-tweaks/01-patches/series b/stage1/02-net-tweaks/01-patches/series
new file mode 100644
index 0000000..1c505d3
--- /dev/null
+++ b/stage1/02-net-tweaks/01-patches/series
@@ -0,0 +1 @@
+01-persistant-net.diff
diff --git a/stage1/02-net-tweaks/files/hostname b/stage1/02-net-tweaks/files/hostname
deleted file mode 100644
index 41757af..0000000
--- a/stage1/02-net-tweaks/files/hostname
+++ /dev/null
@@ -1 +0,0 @@
-raspberrypi
diff --git a/stage2/01-sys-tweaks/00-debconf b/stage2/01-sys-tweaks/00-debconf
index afd3914..214b497 100644
--- a/stage2/01-sys-tweaks/00-debconf
+++ b/stage2/01-sys-tweaks/00-debconf
@@ -9,10 +9,10 @@ tzdata	tzdata/Areas	select	Etc
 tzdata	tzdata/Zones/Etc	select	UTC
 # Locales to be generated:
 # Choices: All locales, aa_DJ ISO-8859-1, aa_DJ.UTF-8 UTF-8, aa_ER UTF-8, aa_ER@saaho UTF-8, aa_ET UTF-8, af_ZA ISO-8859-1, af_ZA.UTF-8 UTF-8, ak_GH UTF-8, am_ET UTF-8, an_ES ISO-8859-15, an_ES.UTF-8 UTF-8, anp_IN UTF-8, ar_AE ISO-8859-6, ar_AE.UTF-8 UTF-8, ar_BH ISO-8859-6, ar_BH.UTF-8 UTF-8, ar_DZ ISO-8859-6, ar_DZ.UTF-8 UTF-8, ar_EG ISO-8859-6, ar_EG.UTF-8 UTF-8, ar_IN UTF-8, ar_IQ ISO-8859-6, ar_IQ.UTF-8 UTF-8, ar_JO ISO-8859-6, ar_JO.UTF-8 UTF-8, ar_KW ISO-8859-6, ar_KW.UTF-8 UTF-8, ar_LB ISO-8859-6, ar_LB.UTF-8 UTF-8, ar_LY ISO-8859-6, ar_LY.UTF-8 UTF-8, ar_MA ISO-8859-6, ar_MA.UTF-8 UTF-8, ar_OM ISO-8859-6, ar_OM.UTF-8 UTF-8, ar_QA ISO-8859-6, ar_QA.UTF-8 UTF-8, ar_SA ISO-8859-6, ar_SA.UTF-8 UTF-8, ar_SD ISO-8859-6, ar_SD.UTF-8 UTF-8, ar_SS UTF-8, ar_SY ISO-8859-6, ar_SY.UTF-8 UTF-8, ar_TN ISO-8859-6, ar_TN.UTF-8 UTF-8, ar_YE ISO-8859-6, ar_YE.UTF-8 UTF-8, as_IN UTF-8, ast_ES ISO-8859-15, ast_ES.UTF-8 UTF-8, ayc_PE UTF-8, az_AZ UTF-8, be_BY CP1251, be_BY.UTF-8 UTF-8, be_BY@latin UTF-8, bem_ZM UTF-8, ber_DZ UTF-8, ber_MA UTF-8, bg_BG CP1251, bg_BG.UTF-8 UTF-8, bho_IN UTF-8, bn_BD UTF-8, bn_IN UTF-8, bo_CN UTF-8, bo_IN UTF-8, br_FR ISO-8859-1, br_FR.UTF-8 UTF-8, br_FR@euro ISO-8859-15, brx_IN UTF-8, bs_BA ISO-8859-2, bs_BA.UTF-8 UTF-8, byn_ER UTF-8, ca_AD ISO-8859-15, ca_AD.UTF-8 UTF-8, ca_ES ISO-8859-1, ca_ES.UTF-8 UTF-8, ca_ES.UTF-8@valencia UTF-8, ca_ES@euro ISO-8859-15, ca_ES@valencia ISO-8859-15, ca_FR ISO-8859-15, ca_FR.UTF-8 UTF-8, ca_IT ISO-8859-15, ca_IT.UTF-8 UTF-8, cmn_TW UTF-8, crh_UA UTF-8, cs_CZ ISO-8859-2, cs_CZ.UTF-8 UTF-8, csb_PL UTF-8, cv_RU UTF-8, cy_GB ISO-8859-14, cy_GB.UTF-8 UTF-8, da_DK ISO-8859-1, da_DK.UTF-8 UTF-8, de_AT ISO-8859-1, de_AT.UTF-8 UTF-8, de_AT@euro ISO-8859-15, de_BE ISO-8859-1, de_BE.UTF-8 UTF-8, de_BE@euro ISO-8859-15, de_CH ISO-8859-1, de_CH.UTF-8 UTF-8, de_DE ISO-8859-1, de_DE.UTF-8 UTF-8, de_DE@euro ISO-8859-15, de_LI.UTF-8 UTF-8, de_LU ISO-8859-1, de_LU.UTF-8 UTF-8, de_LU@euro ISO-8859-15, doi_IN UTF-8, dv_MV UTF-8, dz_BT UTF-8, el_CY ISO-8859-7, el_CY.UTF-8 UTF-8, el_GR ISO-8859-7, el_GR.UTF-8 UTF-8, en_AG UTF-8, en_AU ISO-8859-1, en_AU.UTF-8 UTF-8, en_BW ISO-8859-1, en_BW.UTF-8 UTF-8, en_CA ISO-8859-1, en_CA.UTF-8 UTF-8, en_DK ISO-8859-1, en_DK.ISO-8859-15 ISO-8859-15, en_DK.UTF-8 UTF-8, en_GB ISO-8859-1, en_GB.ISO-8859-15 ISO-8859-15, en_GB.UTF-8 UTF-8, en_HK ISO-8859-1, en_HK.UTF-8 UTF-8, en_IE ISO-8859-1, en_IE.UTF-8 UTF-8, en_IE@euro ISO-8859-15, en_IN UTF-8, en_NG UTF-8, en_NZ ISO-8859-1, en_NZ.UTF-8 UTF-8, en_PH ISO-8859-1, en_PH.UTF-8 UTF-8, en_SG ISO-8859-1, en_SG.UTF-8 UTF-8, en_US ISO-8859-1, en_US.ISO-8859-15 ISO-8859-15, en_US.UTF-8 UTF-8, en_ZA ISO-8859-1, en_ZA.UTF-8 UTF-8, en_ZM UTF-8, en_ZW ISO-8859-1, en_ZW.UTF-8 UTF-8, eo ISO-8859-3, eo.UTF-8 UTF-8, es_AR ISO-8859-1, es_AR.UTF-8 UTF-8, es_BO ISO-8859-1, es_BO.UTF-8 UTF-8, es_CL ISO-8859-1, es_CL.UTF-8 UTF-8, es_CO ISO-8859-1, es_CO.UTF-8 UTF-8, es_CR ISO-8859-1, es_CR.UTF-8 UTF-8, es_CU UTF-8, es_DO ISO-8859-1, es_DO.UTF-8 UTF-8, es_EC ISO-8859-1, es_EC.UTF-8 UTF-8, es_ES ISO-8859-1, es_ES.UTF-8 UTF-8, es_ES@euro ISO-8859-15, es_GT ISO-8859-1, es_GT.UTF-8 UTF-8, es_HN ISO-8859-1, es_HN.UTF-8 UTF-8, es_MX ISO-8859-1, es_MX.UTF-8 UTF-8, es_NI ISO-8859-1, es_NI.UTF-8 UTF-8, es_PA ISO-8859-1, es_PA.UTF-8 UTF-8, es_PE ISO-8859-1, es_PE.UTF-8 UTF-8, es_PR ISO-8859-1, es_PR.UTF-8 UTF-8, es_PY ISO-8859-1, es_PY.UTF-8 UTF-8, es_SV ISO-8859-1, es_SV.UTF-8 UTF-8, es_US ISO-8859-1, es_US.UTF-8 UTF-8, es_UY ISO-8859-1, es_UY.UTF-8 UTF-8, es_VE ISO-8859-1, es_VE.UTF-8 UTF-8, et_EE ISO-8859-1, et_EE.ISO-8859-15 ISO-8859-15, et_EE.UTF-8 UTF-8, eu_ES ISO-8859-1, eu_ES.UTF-8 UTF-8, eu_ES@euro ISO-8859-15, eu_FR ISO-8859-1, eu_FR.UTF-8 UTF-8, eu_FR@euro ISO-8859-15, fa_IR UTF-8, ff_SN UTF-8, fi_FI ISO-8859-1, fi_FI.UTF-8 UTF-8, fi_FI@euro ISO-8859-15, fil_PH UTF-8, fo_FO ISO-8859-1, fo_FO.UTF-8 UTF-8, fr_BE ISO-8859-1, fr_BE.UTF-8 UTF-8, fr_BE@euro ISO-8859-15, fr_CA ISO-8859-1, fr_CA.UTF-8 UTF-8, fr_CH ISO-8859-1, fr_CH.UTF-8 UTF-8, fr_FR ISO-8859-1, fr_FR.UTF-8 UTF-8, fr_FR@euro ISO-8859-15, fr_LU ISO-8859-1, fr_LU.UTF-8 UTF-8, fr_LU@euro ISO-8859-15, fur_IT UTF-8, fy_DE UTF-8, fy_NL UTF-8, ga_IE ISO-8859-1, ga_IE.UTF-8 UTF-8, ga_IE@euro ISO-8859-15, gd_GB ISO-8859-15, gd_GB.UTF-8 UTF-8, gez_ER UTF-8, gez_ER@abegede UTF-8, gez_ET UTF-8, gez_ET@abegede UTF-8, gl_ES ISO-8859-1, gl_ES.UTF-8 UTF-8, gl_ES@euro ISO-8859-15, gu_IN UTF-8, gv_GB ISO-8859-1, gv_GB.UTF-8 UTF-8, ha_NG UTF-8, hak_TW UTF-8, he_IL ISO-8859-8, he_IL.UTF-8 UTF-8, hi_IN UTF-8, hne_IN UTF-8, hr_HR ISO-8859-2, hr_HR.UTF-8 UTF-8, hsb_DE ISO-8859-2, hsb_DE.UTF-8 UTF-8, ht_HT UTF-8, hu_HU ISO-8859-2, hu_HU.UTF-8 UTF-8, hy_AM UTF-8, hy_AM.ARMSCII-8 ARMSCII-8, ia_FR UTF-8, id_ID ISO-8859-1, id_ID.UTF-8 UTF-8, ig_NG UTF-8, ik_CA UTF-8, is_IS ISO-8859-1, is_IS.UTF-8 UTF-8, it_CH ISO-8859-1, it_CH.UTF-8 UTF-8, it_IT ISO-8859-1, it_IT.UTF-8 UTF-8, it_IT@euro ISO-8859-15, iu_CA UTF-8, iw_IL ISO-8859-8, iw_IL.UTF-8 UTF-8, ja_JP.EUC-JP EUC-JP, ja_JP.UTF-8 UTF-8, ka_GE GEORGIAN-PS, ka_GE.UTF-8 UTF-8, kk_KZ PT154, kk_KZ RK1048, kk_KZ.UTF-8 UTF-8, kl_GL ISO-8859-1, kl_GL.UTF-8 UTF-8, km_KH UTF-8, kn_IN UTF-8, ko_KR.EUC-KR EUC-KR, ko_KR.UTF-8 UTF-8, kok_IN UTF-8, ks_IN UTF-8, ks_IN@devanagari UTF-8, ku_TR ISO-8859-9, ku_TR.UTF-8 UTF-8, kw_GB ISO-8859-1, kw_GB.UTF-8 UTF-8, ky_KG UTF-8, lb_LU UTF-8, lg_UG ISO-8859-10, lg_UG.UTF-8 UTF-8, li_BE UTF-8, li_NL UTF-8, lij_IT UTF-8, lo_LA UTF-8, lt_LT ISO-8859-13, lt_LT.UTF-8 UTF-8, lv_LV ISO-8859-13, lv_LV.UTF-8 UTF-8, lzh_TW UTF-8, mag_IN UTF-8, mai_IN UTF-8, mg_MG ISO-8859-15, mg_MG.UTF-8 UTF-8, mhr_RU UTF-8, mi_NZ ISO-8859-13, mi_NZ.UTF-8 UTF-8, mk_MK ISO-8859-5, mk_MK.UTF-8 UTF-8, ml_IN UTF-8, mn_MN UTF-8, mni_IN UTF-8, mr_IN UTF-8, ms_MY ISO-8859-1, ms_MY.UTF-8 UTF-8, mt_MT ISO-8859-3, mt_MT.UTF-8 UTF-8, my_MM UTF-8, nan_TW UTF-8, nan_TW@latin UTF-8, nb_NO ISO-8859-1, nb_NO.UTF-8 UTF-8, nds_DE UTF-8, nds_NL UTF-8, ne_NP UTF-8, nhn_MX UTF-8, niu_NU UTF-8, niu_NZ UTF-8, nl_AW UTF-8, nl_BE ISO-8859-1, nl_BE.UTF-8 UTF-8, nl_BE@euro ISO-8859-15, nl_NL ISO-8859-1, nl_NL.UTF-8 UTF-8, nl_NL@euro ISO-8859-15, nn_NO ISO-8859-1, nn_NO.UTF-8 UTF-8, nr_ZA UTF-8, nso_ZA UTF-8, oc_FR ISO-8859-1, oc_FR.UTF-8 UTF-8, om_ET UTF-8, om_KE ISO-8859-1, om_KE.UTF-8 UTF-8, or_IN UTF-8, os_RU UTF-8, pa_IN UTF-8, pa_PK UTF-8, pap_AN UTF-8, pap_AW UTF-8, pap_CW UTF-8, pl_PL ISO-8859-2, pl_PL.UTF-8 UTF-8, ps_AF UTF-8, pt_BR ISO-8859-1, pt_BR.UTF-8 UTF-8, pt_PT ISO-8859-1, pt_PT.UTF-8 UTF-8, pt_PT@euro ISO-8859-15, quz_PE UTF-8, ro_RO ISO-8859-2, ro_RO.UTF-8 UTF-8, ru_RU ISO-8859-5, ru_RU.CP1251 CP1251, ru_RU.KOI8-R KOI8-R, ru_RU.UTF-8 UTF-8, ru_UA KOI8-U, ru_UA.UTF-8 UTF-8, rw_RW UTF-8, sa_IN UTF-8, sat_IN UTF-8, sc_IT UTF-8, sd_IN UTF-8, sd_IN@devanagari UTF-8, se_NO UTF-8, shs_CA UTF-8, si_LK UTF-8, sid_ET UTF-8, sk_SK ISO-8859-2, sk_SK.UTF-8 UTF-8, sl_SI ISO-8859-2, sl_SI.UTF-8 UTF-8, so_DJ ISO-8859-1, so_DJ.UTF-8 UTF-8, so_ET UTF-8, so_KE ISO-8859-1, so_KE.UTF-8 UTF-8, so_SO ISO-8859-1, so_SO.UTF-8 UTF-8, sq_AL ISO-8859-1, sq_AL.UTF-8 UTF-8, sq_MK UTF-8, sr_ME UTF-8, sr_RS UTF-8, sr_RS@latin UTF-8, ss_ZA UTF-8, st_ZA ISO-8859-1, st_ZA.UTF-8 UTF-8, sv_FI ISO-8859-1, sv_FI.UTF-8 UTF-8, sv_FI@euro ISO-8859-15, sv_SE ISO-8859-1, sv_SE.ISO-8859-15 ISO-8859-15, sv_SE.UTF-8 UTF-8, sw_KE UTF-8, sw_TZ UTF-8, szl_PL UTF-8, ta_IN UTF-8, ta_LK UTF-8, te_IN UTF-8, tg_TJ KOI8-T, tg_TJ.UTF-8 UTF-8, th_TH TIS-620, th_TH.UTF-8 UTF-8, the_NP UTF-8, ti_ER UTF-8, ti_ET UTF-8, tig_ER UTF-8, tk_TM UTF-8, tl_PH ISO-8859-1, tl_PH.UTF-8 UTF-8, tn_ZA UTF-8, tr_CY ISO-8859-9, tr_CY.UTF-8 UTF-8, tr_TR ISO-8859-9, tr_TR.UTF-8 UTF-8, ts_ZA UTF-8, tt_RU UTF-8, tt_RU@iqtelif UTF-8, ug_CN UTF-8, uk_UA KOI8-U, uk_UA.UTF-8 UTF-8, unm_US UTF-8, ur_IN UTF-8, ur_PK UTF-8, uz_UZ ISO-8859-1, uz_UZ.UTF-8 UTF-8, uz_UZ@cyrillic UTF-8, ve_ZA UTF-8, vi_VN UTF-8, wa_BE ISO-8859-1, wa_BE.UTF-8 UTF-8, wa_BE@euro ISO-8859-15, wae_CH UTF-8, wal_ET UTF-8, wo_SN UTF-8, xh_ZA ISO-8859-1, xh_ZA.UTF-8 UTF-8, yi_US CP1255, yi_US.UTF-8 UTF-8, yo_NG UTF-8, yue_HK UTF-8, zh_CN GB2312, zh_CN.GB18030 GB18030, zh_CN.GBK GBK, zh_CN.UTF-8 UTF-8, zh_HK BIG5-HKSCS, zh_HK.UTF-8 UTF-8, zh_SG GB2312, zh_SG.GBK GBK, zh_SG.UTF-8 UTF-8, zh_TW BIG5, zh_TW.EUC-TW EUC-TW, zh_TW.UTF-8 UTF-8, zu_ZA ISO-8859-1, zu_ZA.UTF-8 UTF-8
-locales	locales/locales_to_be_generated	multiselect	en_GB.UTF-8 UTF-8
+locales locales/locales_to_be_generated multiselect     en_US.UTF-8 UTF-8
 # Default locale for the system environment:
 # Choices: None, C.UTF-8, en_GB.UTF-8
-locales	locales/default_environment_locale	select	en_GB.UTF-8
+locales locales/default_environment_locale      select  en_US.UTF-8
 # Key to function as AltGr:
 # Choices: The default for the keyboard layout, No AltGr key, Right Alt (AltGr), Right Control, Right Logo key, Menu key, Left Alt, Left Logo key, Keypad Enter key, Both Logo keys, Both Alt keys
 keyboard-configuration	keyboard-configuration/altgr	select	The default for the keyboard layout
diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages
index 60e6c30..ffbcc30 100644
--- a/stage2/01-sys-tweaks/00-packages
+++ b/stage2/01-sys-tweaks/00-packages
@@ -1,13 +1,40 @@
-ssh locales less fbset sudo psmisc strace module-init-tools ed ncdu crda
-console-setup keyboard-configuration debconf-utils parted unzip
-build-essential manpages-dev python bash-completion gdb pkg-config
-python-rpi.gpio v4l-utils
+ssh
+locales 
+less 
+fbset 
+sudo 
+psmisc 
+strace 
+module-init-tools 
+ed 
+ncdu 
+crda
+console-setup 
+keyboard-configuration 
+debconf-utils 
+parted 
+unzip
+build-essential 
+manpages-dev 
+python 
+bash-completion 
+gdb 
+pkg-config
+python-rpi.gpio 
+v4l-utils
 avahi-daemon
 lua5.1
 luajit
-hardlink ca-certificates curl
-fake-hwclock ntp nfs-common usbutils
-libraspberrypi-dev libraspberrypi-doc libfreetype6-dev
+hardlink 
+ca-certificates 
+curl
+fake-hwclock 
+ntp 
+nfs-common 
+usbutils
+libraspberrypi-dev 
+libraspberrypi-doc 
+libfreetype6-dev
 dosfstools
 dphys-swapfile
 raspberrypi-sys-mods
diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh
index 2813047..5107558 100755
--- a/stage2/01-sys-tweaks/01-run.sh
+++ b/stage2/01-sys-tweaks/01-run.sh
@@ -10,6 +10,11 @@ install -m 644 files/ttyoutput.conf			${ROOTFS_DIR}/etc/systemd/system/rc-local.
 install -m 644 files/50raspi				${ROOTFS_DIR}/etc/apt/apt.conf.d/
 install -m 644 files/98-rpi.conf			${ROOTFS_DIR}/etc/sysctl.d/
 
+on_chroot sh -e - <<EOF
+# Update locales
+dpkg-reconfigure --frontend=noninteractive locales
+update-locale LANG=en_US.UTF-8
+EOF
 
 on_chroot sh -e - <<EOF
 systemctl disable hwclock.sh
@@ -21,13 +26,13 @@ systemctl enable apply_noobs_os_config
 systemctl enable resize2fs_once
 EOF
 
-on_chroot sh -e - << \EOF
-for GRP in input spi i2c gpio; do
-	groupadd -f -r $GRP
-done
-for GRP in adm dialout cdrom audio users sudo video games plugdev input gpio spi i2c netdev; do
-  adduser pi $GRP
-done
+on_chroot sh -e - <<\EOF
+	for GRP in input spi i2c gpio; do
+		groupadd -f -r $GRP
+	done
+	for GRP in adm dialout cdrom audio users sudo video games plugdev input gpio spi i2c netdev; do
+	adduser ${USER_NAME} $GRP
+	done
 EOF
 
 on_chroot sh -e - <<EOF
diff --git a/stage2/02-net-tweaks/00-packages b/stage2/02-net-tweaks/00-packages
index 14e534b..3a20079 100644
--- a/stage2/02-net-tweaks/00-packages
+++ b/stage2/02-net-tweaks/00-packages
@@ -1,2 +1,8 @@
-wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-ralink firmware-realtek
+wpasupplicant 
+wireless-tools 
+firmware-atheros 
+firmware-brcm80211 
+firmware-libertas 
+firmware-ralink 
+firmware-realtek
 dhcpcd5