diff --git a/Makefile b/Makefile
index 08241e9..45d3ccd 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ setup:
 
 buildimg:
 	dd if=/dev/zero of=$(BUILDDIR)/$(OSNAME).img bs=512 count=93750
-	mformat -i $(BUILDDIR)/$(OSNAME).img -f 1440 ::
+	mkfs -t vfat $(BUILDDIR)/$(OSNAME).img
 	mmd -i $(BUILDDIR)/$(OSNAME).img ::/EFI
 	mmd -i $(BUILDDIR)/$(OSNAME).img ::/EFI/BOOT
 	mcopy -i $(BUILDDIR)/$(OSNAME).img $(BOOTEFI) ::/EFI/BOOT
diff --git a/run.bat b/run.bat
index 2482315..56b074f 100644
--- a/run.bat
+++ b/run.bat
@@ -1,6 +1,9 @@
 set OSNAME=CustomOS
-set BUILDDIR=%0/../bin
-set OVMFDIR=%0/../../OVMFbin
+set WORKING_FILE=%0
+:: remove double quotes that are around "%0" or builddir and ovmfdir get ugly
+set FIXED_WORKING_FILE=%WORKING_FILE:"=%
+set BUILDDIR=%FIXED_WORKING_FILE%/../bin
+set OVMFDIR=%FIXED_WORKING_FILE%/../../OVMFbin
 
-qemu-system-x86_64 -drive file=%BUILDDIR%/%OSNAME%.img -m 256M -cpu qemu64 -drive if=pflash,format=raw,unit=0,file="%OVMFDIR%/OVMF_CODE-pure-efi.fd",readonly=on -drive if=pflash,format=raw,unit=1,file="%OVMFDIR%/OVMF_VARS-pure-efi.fd" -net none
+qemu-system-x86_64 -drive "file=%BUILDDIR%/%OSNAME%.img" -m 256M -cpu qemu64 -drive "if=pflash,format=raw,unit=0,file=%OVMFDIR%/OVMF_CODE-pure-efi.fd,readonly=on" -drive "if=pflash,format=raw,unit=1,file=%OVMFDIR%/OVMF_VARS-pure-efi.fd" -net none
 pause