diff --git a/infernal.py b/infernal.py
index a41cfd9..8777788 100644
--- a/infernal.py
+++ b/infernal.py
@@ -3,7 +3,7 @@ import re
 import sys
 
 REGISTERS=["%rax", "%rbx", "%rcx", "%rdx", "%rsp", "%rbp", "%rsi", "%rdi",
-			"%r8," "%r9," "%r10", "%r11", "%r12", "%r13", "%r14", "%r15"]
+			"%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15"]
 REG_STATUS_TO_COLOR = {
 	"insert": "green",
 	"change": "yellow",
diff --git a/tests/test_fib.py b/tests/test_fib.py
index b5c97d7..41be569 100644
--- a/tests/test_fib.py
+++ b/tests/test_fib.py
@@ -61,8 +61,8 @@ if __name__ == "__main__":
 
 	# Setup
 	registers = ["%rip","%rbp","%rsp","","%rax","%rdi","%r8","%r9"]
-	emu = infernal.Emulator(fib_prog, registers)
-	painter = infernal.TikzPainter()
+	emu = infernal.Emulator(fib_prog)
+	painter = infernal.TikzPainter(registers)
 	emu.setStack("junk...", "calling eip")
 	emu.setRegs( rip = 0, rbp = 'old bp', rdi = a )