diff --git a/x86_64/debug.sh b/x86_64/debug.sh
index af8bbe2..2a72f12 100755
--- a/x86_64/debug.sh
+++ b/x86_64/debug.sh
@@ -11,4 +11,8 @@ if [ ! -x "$1" ]; then
 fi
 
 breakPoint="$(readelf -h $1 | egrep -i "entry" | egrep -o "0x[a-f0-9]+")"
-gdbtui -q -ex "layout asm" -ex "break *$breakPoint" -ex "set disassembly-flavor intel" $1
+gdb -q \
+	-ex "layout regs" \
+	-ex "break *$breakPoint" \
+	-ex "set disassembly-flavor intel" \
+	$1
diff --git a/x86_64/makefile b/x86_64/makefile
index 1c18afe..a6e6042 100644
--- a/x86_64/makefile
+++ b/x86_64/makefile
@@ -2,12 +2,14 @@ CC = gcc
 AS = nasm
 LD = ld
 
+ASFLAGS = -g -F dwarf -f elf64
+
 ASSEMBLIES = $(wildcard *.asm)
-PROGRAMS = $(patsubst %.asm, bin/%, $(ASSEMBLIES))
+PROGRAMS = $(patsubst %.asm, bin/%, ${ASSEMBLIES})
 
 .PHONY: all clean
 
-all: bin build $(PROGRAMS)
+all: bin build ${PROGRAMS}
 
 clean:
 	-rm -r build
@@ -20,7 +22,7 @@ build:
 	mkdir build
 
 build/%.o: %.asm
-	$(AS) -g -f elf64 $< -o $@
+	${AS} ${ASFLAGS}  $< -o $@
 
 bin/%: build/%.o
-	$(LD) $< -o $@
+	${LD} $< -o $@