diff --git a/basic.sh b/basic.sh
index add14b5..db1accb 100755
--- a/basic.sh
+++ b/basic.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 OSK="ourhardworkbythesewordsguardedpleasedontsteal(c)AppleComputerInc"
-VMDIR=$PWD
+VMDIR=$(realpath $(dirname $0))
 OVMF=$VMDIR/firmware
 #export QEMU_AUDIO_DRV=pa
 #QEMU_AUDIO_DRV=pa
@@ -18,11 +18,13 @@ qemu-system-x86_64 \
     -drive if=pflash,format=raw,file="$OVMF/OVMF_VARS-1024x768.fd" \
     -vga qxl \
     -device ich9-intel-hda -device hda-output \
-    -usb -device usb-kbd -device usb-mouse \
+    -usb -device usb-kbd -device usb-tablet \
     -netdev user,id=net0 \
     -device e1000-82545em,netdev=net0,id=net0,mac=52:54:00:c9:18:27 \
     -device ich9-ahci,id=sata \
-    -drive id=ESP,if=none,format=qcow2,file=ESP.qcow2 \
+    -drive id=ESP,if=none,format=qcow2,file="${VMDIR}/ESP.qcow2" \
     -device ide-hd,bus=sata.2,drive=ESP \
-    -drive id=InstallMedia,format=raw,if=none,file=BaseSystem.img \
+    -drive id=InstallMedia,format=raw,if=none,file="${VMDIR}/BaseSystem.img" \
     -device ide-hd,bus=sata.3,drive=InstallMedia \
+    -drive id=SystemDisk,if=none,file="${VMDIR}/MyDisk.qcow2" \
+    -device ide-hd,bus=sata.4,drive=SystemDisk
diff --git a/firmware/OVMF_VARS-1024x768.fd b/firmware/OVMF_VARS-1024x768.fd
index 76f536b..cc471c4 100644
Binary files a/firmware/OVMF_VARS-1024x768.fd and b/firmware/OVMF_VARS-1024x768.fd differ
diff --git a/jumpstart.sh b/jumpstart.sh
index 1b8756e..28c2d88 100755
--- a/jumpstart.sh
+++ b/jumpstart.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # jumpstart.sh: Fetches BaseSystem and converts it to a viable format.
 # by Foxlet <foxlet@furcode.co>
@@ -36,4 +36,4 @@ case $argument in
         ;;
 esac
 
-"$TOOLS/dmg2img" "$TOOLS/FetchMacOS/BaseSystem/BaseSystem.dmg" "$PWD/BaseSystem.img"
+dmg2img "$TOOLS/FetchMacOS/BaseSystem/BaseSystem.dmg" "$PWD/BaseSystem.img"
diff --git a/make.sh b/make.sh
index 8495561..df6567c 100755
--- a/make.sh
+++ b/make.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # make.sh: Generate customized libvirt XML.
 # by Foxlet <foxlet@furcode.co>
diff --git a/tools/FetchMacOS/fetch.sh b/tools/FetchMacOS/fetch.sh
index df76311..df5c8de 100755
--- a/tools/FetchMacOS/fetch.sh
+++ b/tools/FetchMacOS/fetch.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # fetch.sh: Run fetch-macos.py with safety checks
 # by Foxlet <foxlet@furcode.co>
diff --git a/tools/template.xml.in b/tools/template.xml.in
index 321552f..2d89087 100644
--- a/tools/template.xml.in
+++ b/tools/template.xml.in
@@ -31,7 +31,7 @@
     <suspend-to-disk enabled='no'/>
   </pm>
   <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+	  <emulator>/run/current-system/sw/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='VMDIR/ESP.qcow2'/>