diff --git a/bin/3-corax+.8o b/bin/3-corax+.8o
index ec8a92f..454067f 100644
--- a/bin/3-corax+.8o
+++ b/bin/3-corax+.8o
@@ -68,7 +68,8 @@
   v5 := 42
   v6 := 43
   drawop im3 imX
-  i := image-ok
+  i := image-no
+  if v6 != 42 then i := image-ok
   if v6 != 43 then i := image-no
   sprite x2 y 4
 
@@ -79,6 +80,7 @@
   drawop im4 imX
   i := image-no
   if v5 == 42 then i := image-ok
+  if v5 == 43 then i := image-no
   sprite x2 y 4
 
 #################
@@ -86,8 +88,9 @@
 
   y := 11
   drawop im5 imX
-  i := image-no
+  i := image-no  
   if v5 != v6 then i := image-ok
+  if v5 != v5 then i := image-no
   sprite x2 y 4
 
 #################
@@ -107,6 +110,7 @@
   drawop im9 imX
   i := image-no
   if v5 == v6 then i := image-ok
+  if v5 == vb then i := image-no
   sprite x2 y 4
 
 #################
diff --git a/bin/3-corax+.ch8 b/bin/3-corax+.ch8
index 9fc874c..07b8ed4 100644
Binary files a/bin/3-corax+.ch8 and b/bin/3-corax+.ch8 differ
diff --git a/docs/3-corax+.html b/docs/3-corax+.html
index 44e5d4e..3119db8 100644
--- a/docs/3-corax+.html
+++ b/docs/3-corax+.html
@@ -1,5 +1,5 @@
 <!-- Standalone Generated By Octo (octo-ide.com) -->
-<script>data={"program":"# This is an adaptation and extension of the CHIP-8 test rom from corax89,\n# original can be found here:\n# https://github.com/corax89/chip8-test-rom\n\n# MIT License\n#\n# Copyright (c) 2019 corax89, 2023,2024 Timendus\n#\n# Permission is hereby granted, free of charge, to any person obtaining a copy\n# of this software and associated documentation files (the \"Software\"), to deal\n# in the Software without restriction, including without limitation the rights\n# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n# copies of the Software, and to permit persons to whom the Software is\n# furnished to do so, subject to the following conditions:\n#\n# The above copyright notice and this permission notice shall be included in all\n# copies or substantial portions of the Software.\n#\n# THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n# SOFTWARE.\n\n:alias x0 v8\n:alias x1 v9\n:alias x2 vA\n:alias y  vB\n\n:macro drawop A B {\n  i := A\n  sprite x0 y 4\n\n  i := B\n  sprite x1 y 4\n}\n\n: test-2X-0E\n  v0 := 1\n  return\n  # These opcodes will run if the interpreter doesn't have return (00EE) implemented:\n  v0 := 2\n  jump test-2X-0E-hard-return\n\n: main\n  clear\n\n  # Display current version\n  x0 := 50\n  y := 26\n  i := version-0-0\n  sprite x0 y 4\n  x0 := 58\n  i := version-1-0\n  sprite x0 y 4\n\n  # Show output in the first column\n  x0 := 2\n  x1 := 6\n  x2 := 11\n  y := 1\n\n#################\n# Test 3xNN\n\n  v5 := 42\n  v6 := 43\n  drawop im3 imX\n  i := image-ok\n  if v6 != 43 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test 4xNN\n\n  y := 6\n  drawop im4 imX\n  i := image-no\n  if v5 == 42 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 5xy0\n\n  y := 11\n  drawop im5 imX\n  i := image-no\n  if v5 != v6 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 7xNN\n\n  y := 16\n  drawop im7 imX\n  i := image-no\n  v6 += 255\n  if v6 == 42 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 9xy0\n\n  y += 5\n  drawop im9 imX\n  i := image-no\n  if v5 == v6 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 1NNN (displayed as 1X)\n\n  y += 5\n  drawop im1 imX\n  i := image-ok\n  jump test-1X-pass\n  i := image-no\n: test-1X-pass\n  sprite x2 y 4\n\n  # Show output in the second column\n  x0 := 18\n  x1 := 22\n  x2 := 27\n  y := 1\n\n#################\n# Test calling subroutines (2NNN, displayed as 2X)\n\n  drawop im2 imX\n  v0 := 0\n  test-2X-0E    # Attempt to run a subroutine\n: test-2X-0E-hard-return\n  i := image-ok\n  if v0 == 0 then i := image-no  # Subroutine was never called\n  sprite x2 y 4\n\n#################\n# Test returning from subroutines (00EE, displayed as 0E)\n\n  y += 5\n  drawop im0 imE\n  i := image-ok\n  if v0 == 2 then i := image-no  # Return didn't work\n  if v0 != 0 then sprite x2 y 4  # If subroutine wasn't called, return wasn't tested\n\n#################\n# Test 8xy0\n\n  y += 5\n  drawop im8 im0\n  i := image-no\n  v5 := 42\n  v7 := 0\n  v7 := v5\n  if v7 == 42 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy1\n\n  y += 5\n  drawop im8 im1\n  i := image-no\n  v6 := 11\n  v7 := 42\n  v7 |= v6\n  if v7 == 43 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy2\n\n  y += 5\n  drawop im8 im2\n  i := image-no\n  v6 := 120\n  v7 := 31\n  v7 &= v6\n  if v7 == 24 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy3\n\n  y += 5\n  drawop im8 im3\n  i := image-no\n  v6 := 120\n  v7 := 31\n  v7 ^= v6\n  if v7 == 103 then i := image-ok\n  sprite x2 y 4\n\n  # Show output in the third column\n  x0 := 34\n  x1 := 38\n  x2 := 43\n  y  := 1\n\n#################\n# Test 8xy4\n\n  drawop im8 im4\n  i := image-no\n  v6 := 140\n  v7 := 140\n  v7 += v6\n  if v7 == 24 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy5\n\n  y += 5\n  drawop im8 im5\n  i := image-no\n  v6 := 140\n  v7 := 120\n  v7 -= v6\n  if v7 == 236 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy7\n\n  y += 5\n  drawop im8 im7\n  i := image-no\n  v6 := 120\n  v7 := 140\n  v7 =- v6\n  if v7 == 236 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy6\n\n  y += 5\n  drawop im8 im6\n  i := image-no\n  v6 := 15\n  v6 >>= v6\n  if v6 == 7 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xyE\n\n  y += 5\n  drawop im8 imE\n  i := image-no\n  v6 := 224\n  v6 <<= v6\n  if v6 == 192 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test Fx65\n\n  y += 5\n  drawop imF im6\n  i := scratchpad\n  load v1\n  i := image-ok\n  if v0 != 0xAA then i := image-no\n  if v1 != 0x55 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test Fx55\n\n  x0 := 50\n  x1 := 54\n  x2 := 59\n  y  := 1\n  drawop imF im5\n  i := scratchpad\n  v0 := 0\n  v1 := 48\n  save v1\n  i := scratchpad\n  load v0\n  v1 := v0\n  i := scratchpad-plus-1\n  load v0\n  i := image-ok\n  if v0 != 48 then i := image-no\n  if v1 != 0 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test Fx33\n\n  y += 5\n  drawop imF im3\n\n  # N >= 100\n  i := scratchpad\n  v6 := 137\n  bcd v6\n  load v2\n  i := image-no\n  if v0 != 1 then jump fx33-fail\n  if v1 != 3 then jump fx33-fail\n  if v2 != 7 then jump fx33-fail\n  \n  # N < 100\n  i := scratchpad\n  v6 := 65\n  bcd v6\n  load v2\n  i := image-no  \n  if v0 != 0 then jump fx33-fail\n  if v1 != 6 then jump fx33-fail\n  if v2 != 5 then jump fx33-fail\n  \n  # N < 10\n  i := scratchpad\n  v6 := 4\n  bcd v6\n  load v2\n  i := image-no\n  if v0 != 0 then jump fx33-fail\n  if v1 != 0 then jump fx33-fail\n  if v2 != 4 then jump fx33-fail\n\t\n  i := image-ok\n: fx33-fail\n  sprite x2 y 4\n\n#################\n# Test Fx1E\n\n  y += 5\n  drawop imF imE\n  i := image-no\n  v6 := 4\n  i += v6\n  sprite x2 y 4\n\n#################\n# Test to see if registers are 8 bit, as thoroughly as possible.\n\n  y += 5\n  drawop imV imX\n  i := image-ok\n\n  # Addition opcodes should not allow us to overflow\n  v6 := 255\n  v6 += 10\n  if v6 != 9 then i := image-no\n  v6 >>= v6\n  if v6 != 4 then i := image-no\n  v6 := 255\n  v0 := 10\n  v6 += v0\n  if v6 != 9 then i := image-no\n  v6 >>= v6\n  if v6 != 4 then i := image-no\n\n  # Shift opcodes should not retain bits\n  v6 := 255\n  v6 <<= v6\n  v6 >>= v6\n  if v6 != 127 then i := image-no\n  v6 >>= v6\n  v6 <<= v6\n  if v6 != 126 then i := image-no\n\n  # Subtraction should wrap back to positive\n  v6 := 5\n  v6 -= 10\n  if v6 != 251 then i := image-no\n  v6 := 5\n  v6 -= v0\n  if v6 != 251 then i := image-no\n  v6 := 5\n  v0 =- v6\n  if v0 != 251 then i := image-no\n\n  sprite x2 y 4\n\n#################\n# Test is done!\n\n  loop again\n\n: scratchpad\n  0xAA\n: scratchpad-plus-1\n  0x55 0\n\n# Positive and negative images\n: image-no\n  0b00000000\n  0b10100000\n  0b01000000\n  0b10100000\n: image-ok\n  0b00000000\n  0b10100000\n  0b11000000\n  0b10000000\n\n# Individual characters, some taken from Corax89' test.\n: im0\n  0b11100000\n  0b10100000\n  0b10100000\n  0b11100000\n: im1\n  0b11000000\n  0b01000000\n  0b01000000\n  0b11100000\n: im2\n  0b11100000\n  0b00100000\n  0b11000000\n  0b11100000\n: im3\n  0b11100000\n  0b01100000\n  0b00100000\n  0b11100000\n: im4\n  0b10100000\n  0b11100000\n  0b00100000\n  0b00100000\n: im5\n  0b11100000\n  0b11000000\n  0b00100000\n  0b11000000\n: im6\n  0b01100000\n  0b10000000\n  0b11100000\n  0b11100000\n: im7\n  0b11100000\n  0b00100000\n  0b01000000\n  0b01000000\n: im8\n  0b11100000\n  0b11100000\n  0b10100000\n  0b11100000\n: im9\n  0b11100000\n  0b11100000\n  0b00100000\n  0b11000000\n: imA\n  0b01000000\n  0b10100000\n  0b11100000\n  0b10100000\n: imB\n  0b11000000\n  0b11100000\n  0b10100000\n  0b11100000\n: imC\n  0b11100000\n  0b10000000\n  0b10000000\n  0b11100000\n: imD\n  0b11000000\n  0b10100000\n  0b10100000\n  0b11000000\n: imE\n  0b11100000\n  0b11000000\n  0b10000000\n  0b11100000\n: imF\n  0b11100000\n  0b10000000\n  0b11000000\n  0b10000000\n: imV\n  0b00000000\n  0b10100000\n  0b10100000\n  0b01000000\n: imX\n  0b10100000\n  0b01000000\n  0b10100000\n  0b10100000\n\n: version\n: version-0-0\n  0x0a 0xae 0xa2 0x42\n: version-1-0\n  0x38 0x08 0x30 0xb8\n\n","options":{"tickrate":20,"fillColor":"#FFCC00","fillColor2":"#FF6600","blendColor":"#662200","backgroundColor":"#996600","buzzColor":"#FFAA00","quietColor":"#000000","shiftQuirks":false,"loadStoreQuirks":false,"vfOrderQuirks":false,"clipQuirks":true,"jumpQuirks":false,"logicQuirks":true,"vBlankQuirks":true,"screenRotation":0,"maxSize":3216,"touchInputMode":"vip","fontStyle":"octo","displayScale":"6"},"rom":[18,10,96,1,0,238,96,2,18,166,0,224,104,50,107,26,164,241,216,180,104,58,164,245,216,180,104,2,105,6,106,11,107,1,101,42,102,43,164,181,216,180,164,237,217,180,164,165,54,43,164,161,218,180,107,6,164,185,216,180,164,237,217,180,164,161,69,42,164,165,218,180,107,11,164,189,216,180,164,237,217,180,164,161,85,96,164,165,218,180,107,16,164,197,216,180,164,237,217,180,164,161,118,255,70,42,164,165,218,180,123,5,164,205,216,180,164,237,217,180,164,161,149,96,164,165,218,180,123,5,164,173,216,180,164,237,217,180,164,165,18,144,164,161,218,180,104,18,105,22,106,27,107,1,164,177,216,180,164,237,217,180,96,0,34,2,164,165,64,0,164,161,218,180,123,5,164,169,216,180,164,225,217,180,164,165,64,2,164,161,48,0,218,180,123,5,164,201,216,180,164,169,217,180,164,161,101,42,103,0,135,80,71,42,164,165,218,180,123,5,164,201,216,180,164,173,217,180,164,161,102,11,103,42,135,97,71,43,164,165,218,180,123,5,164,201,216,180,164,177,217,180,164,161,102,120,103,31,135,98,71,24,164,165,218,180,123,5,164,201,216,180,164,181,217,180,164,161,102,120,103,31,135,99,71,103,164,165,218,180,104,34,105,38,106,43,107,1,164,201,216,180,164,185,217,180,164,161,102,140,103,140,135,100,71,24,164,165,218,180,123,5,164,201,216,180,164,189,217,180,164,161,102,140,103,120,135,101,71,236,164,165,218,180,123,5,164,201,216,180,164,197,217,180,164,161,102,120,103,140,135,103,71,236,164,165,218,180,123,5,164,201,216,180,164,193,217,180,164,161,102,15,134,102,70,7,164,165,218,180,123,5,164,201,216,180,164,225,217,180,164,161,102,224,134,110,70,192,164,165,218,180,123,5,164,229,216,180,164,193,217,180,164,158,241,101,164,165,48,170,164,161,49,85,164,161,218,180,104,50,105,54,106,59,107,1,164,229,216,180,164,189,217,180,164,158,96,0,97,48,241,85,164,158,240,101,129,0,164,159,240,101,164,165,48,48,164,161,49,0,164,161,218,180,123,5,164,229,216,180,164,181,217,180,164,158,102,137,246,51,242,101,164,161,48,1,20,50,49,3,20,50,50,7,20,50,164,158,102,65,246,51,242,101,164,161,48,0,20,50,49,6,20,50,50,5,20,50,164,158,102,4,246,51,242,101,164,161,48,0,20,50,49,0,20,50,50,4,20,50,164,165,218,180,123,5,164,229,216,180,164,225,217,180,164,161,102,4,246,30,218,180,123,5,164,233,216,180,164,237,217,180,164,165,102,255,118,10,54,9,164,161,134,102,54,4,164,161,102,255,96,10,134,4,54,9,164,161,134,102,54,4,164,161,102,255,134,110,134,102,54,127,164,161,134,102,134,110,54,126,164,161,102,5,118,246,54,251,164,161,102,5,134,5,54,251,164,161,102,5,128,103,48,251,164,161,218,180,20,156,170,85,0,0,160,64,160,0,160,192,128,224,160,160,224,192,64,64,224,224,32,192,224,224,96,32,224,160,224,32,32,224,192,32,192,96,128,224,224,224,32,64,64,224,224,160,224,224,224,32,192,64,160,224,160,192,224,160,224,224,128,128,224,192,160,160,192,224,192,128,224,224,128,192,128,0,160,160,64,160,64,160,160,10,174,162,66,56,8,48,184]}</script>
+<script>data={"program":"# This is an adaptation and extension of the CHIP-8 test rom from corax89,\n# original can be found here:\n# https://github.com/corax89/chip8-test-rom\n\n# MIT License\n#\n# Copyright (c) 2019 corax89, 2023,2024 Timendus\n#\n# Permission is hereby granted, free of charge, to any person obtaining a copy\n# of this software and associated documentation files (the \"Software\"), to deal\n# in the Software without restriction, including without limitation the rights\n# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n# copies of the Software, and to permit persons to whom the Software is\n# furnished to do so, subject to the following conditions:\n#\n# The above copyright notice and this permission notice shall be included in all\n# copies or substantial portions of the Software.\n#\n# THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n# SOFTWARE.\n\n:alias x0 v8\n:alias x1 v9\n:alias x2 vA\n:alias y  vB\n\n:macro drawop A B {\n  i := A\n  sprite x0 y 4\n\n  i := B\n  sprite x1 y 4\n}\n\n: test-2X-0E\n  v0 := 1\n  return\n  # These opcodes will run if the interpreter doesn't have return (00EE) implemented:\n  v0 := 2\n  jump test-2X-0E-hard-return\n\n: main\n  clear\n\n  # Display current version\n  x0 := 50\n  y := 26\n  i := version-0-0\n  sprite x0 y 4\n  x0 := 58\n  i := version-1-0\n  sprite x0 y 4\n\n  # Show output in the first column\n  x0 := 2\n  x1 := 6\n  x2 := 11\n  y := 1\n\n#################\n# Test 3xNN\n\n  v5 := 42\n  v6 := 43\n  drawop im3 imX\n  i := image-no\n  if v6 != 42 then i := image-ok\n  if v6 != 43 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test 4xNN\n\n  y := 6\n  drawop im4 imX\n  i := image-no\n  if v5 == 42 then i := image-ok\n  if v5 == 43 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test 5xy0\n\n  y := 11\n  drawop im5 imX\n  i := image-no  \n  if v5 != v6 then i := image-ok\n  if v5 != v5 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test 7xNN\n\n  y := 16\n  drawop im7 imX\n  i := image-no\n  v6 += 255\n  if v6 == 42 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 9xy0\n\n  y += 5\n  drawop im9 imX\n  i := image-no\n  if v5 == v6 then i := image-ok\n  if v5 == vb then i := image-no\n  sprite x2 y 4\n\n#################\n# Test 1NNN (displayed as 1X)\n\n  y += 5\n  drawop im1 imX\n  i := image-ok\n  jump test-1X-pass\n  i := image-no\n: test-1X-pass\n  sprite x2 y 4\n\n  # Show output in the second column\n  x0 := 18\n  x1 := 22\n  x2 := 27\n  y := 1\n\n#################\n# Test calling subroutines (2NNN, displayed as 2X)\n\n  drawop im2 imX\n  v0 := 0\n  test-2X-0E    # Attempt to run a subroutine\n: test-2X-0E-hard-return\n  i := image-ok\n  if v0 == 0 then i := image-no  # Subroutine was never called\n  sprite x2 y 4\n\n#################\n# Test returning from subroutines (00EE, displayed as 0E)\n\n  y += 5\n  drawop im0 imE\n  i := image-ok\n  if v0 == 2 then i := image-no  # Return didn't work\n  if v0 != 0 then sprite x2 y 4  # If subroutine wasn't called, return wasn't tested\n\n#################\n# Test 8xy0\n\n  y += 5\n  drawop im8 im0\n  i := image-no\n  v5 := 42\n  v7 := 0\n  v7 := v5\n  if v7 == 42 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy1\n\n  y += 5\n  drawop im8 im1\n  i := image-no\n  v6 := 11\n  v7 := 42\n  v7 |= v6\n  if v7 == 43 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy2\n\n  y += 5\n  drawop im8 im2\n  i := image-no\n  v6 := 120\n  v7 := 31\n  v7 &= v6\n  if v7 == 24 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy3\n\n  y += 5\n  drawop im8 im3\n  i := image-no\n  v6 := 120\n  v7 := 31\n  v7 ^= v6\n  if v7 == 103 then i := image-ok\n  sprite x2 y 4\n\n  # Show output in the third column\n  x0 := 34\n  x1 := 38\n  x2 := 43\n  y  := 1\n\n#################\n# Test 8xy4\n\n  drawop im8 im4\n  i := image-no\n  v6 := 140\n  v7 := 140\n  v7 += v6\n  if v7 == 24 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy5\n\n  y += 5\n  drawop im8 im5\n  i := image-no\n  v6 := 140\n  v7 := 120\n  v7 -= v6\n  if v7 == 236 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy7\n\n  y += 5\n  drawop im8 im7\n  i := image-no\n  v6 := 120\n  v7 := 140\n  v7 =- v6\n  if v7 == 236 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xy6\n\n  y += 5\n  drawop im8 im6\n  i := image-no\n  v6 := 15\n  v6 >>= v6\n  if v6 == 7 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test 8xyE\n\n  y += 5\n  drawop im8 imE\n  i := image-no\n  v6 := 224\n  v6 <<= v6\n  if v6 == 192 then i := image-ok\n  sprite x2 y 4\n\n#################\n# Test Fx65\n\n  y += 5\n  drawop imF im6\n  i := scratchpad\n  load v1\n  i := image-ok\n  if v0 != 0xAA then i := image-no\n  if v1 != 0x55 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test Fx55\n\n  x0 := 50\n  x1 := 54\n  x2 := 59\n  y  := 1\n  drawop imF im5\n  i := scratchpad\n  v0 := 0\n  v1 := 48\n  save v1\n  i := scratchpad\n  load v0\n  v1 := v0\n  i := scratchpad-plus-1\n  load v0\n  i := image-ok\n  if v0 != 48 then i := image-no\n  if v1 != 0 then i := image-no\n  sprite x2 y 4\n\n#################\n# Test Fx33\n\n  y += 5\n  drawop imF im3\n\n  # N >= 100\n  i := scratchpad\n  v6 := 137\n  bcd v6\n  load v2\n  i := image-no\n  if v0 != 1 then jump fx33-fail\n  if v1 != 3 then jump fx33-fail\n  if v2 != 7 then jump fx33-fail\n  \n  # N < 100\n  i := scratchpad\n  v6 := 65\n  bcd v6\n  load v2\n  i := image-no  \n  if v0 != 0 then jump fx33-fail\n  if v1 != 6 then jump fx33-fail\n  if v2 != 5 then jump fx33-fail\n  \n  # N < 10\n  i := scratchpad\n  v6 := 4\n  bcd v6\n  load v2\n  i := image-no\n  if v0 != 0 then jump fx33-fail\n  if v1 != 0 then jump fx33-fail\n  if v2 != 4 then jump fx33-fail\n\t\n  i := image-ok\n: fx33-fail\n  sprite x2 y 4\n\n#################\n# Test Fx1E\n\n  y += 5\n  drawop imF imE\n  i := image-no\n  v6 := 4\n  i += v6\n  sprite x2 y 4\n\n#################\n# Test to see if registers are 8 bit, as thoroughly as possible.\n\n  y += 5\n  drawop imV imX\n  i := image-ok\n\n  # Addition opcodes should not allow us to overflow\n  v6 := 255\n  v6 += 10\n  if v6 != 9 then i := image-no\n  v6 >>= v6\n  if v6 != 4 then i := image-no\n  v6 := 255\n  v0 := 10\n  v6 += v0\n  if v6 != 9 then i := image-no\n  v6 >>= v6\n  if v6 != 4 then i := image-no\n\n  # Shift opcodes should not retain bits\n  v6 := 255\n  v6 <<= v6\n  v6 >>= v6\n  if v6 != 127 then i := image-no\n  v6 >>= v6\n  v6 <<= v6\n  if v6 != 126 then i := image-no\n\n  # Subtraction should wrap back to positive\n  v6 := 5\n  v6 -= 10\n  if v6 != 251 then i := image-no\n  v6 := 5\n  v6 -= v0\n  if v6 != 251 then i := image-no\n  v6 := 5\n  v0 =- v6\n  if v0 != 251 then i := image-no\n\n  sprite x2 y 4\n\n#################\n# Test is done!\n\n  loop again\n\n: scratchpad\n  0xAA\n: scratchpad-plus-1\n  0x55 0\n\n# Positive and negative images\n: image-no\n  0b00000000\n  0b10100000\n  0b01000000\n  0b10100000\n: image-ok\n  0b00000000\n  0b10100000\n  0b11000000\n  0b10000000\n\n# Individual characters, some taken from Corax89' test.\n: im0\n  0b11100000\n  0b10100000\n  0b10100000\n  0b11100000\n: im1\n  0b11000000\n  0b01000000\n  0b01000000\n  0b11100000\n: im2\n  0b11100000\n  0b00100000\n  0b11000000\n  0b11100000\n: im3\n  0b11100000\n  0b01100000\n  0b00100000\n  0b11100000\n: im4\n  0b10100000\n  0b11100000\n  0b00100000\n  0b00100000\n: im5\n  0b11100000\n  0b11000000\n  0b00100000\n  0b11000000\n: im6\n  0b01100000\n  0b10000000\n  0b11100000\n  0b11100000\n: im7\n  0b11100000\n  0b00100000\n  0b01000000\n  0b01000000\n: im8\n  0b11100000\n  0b11100000\n  0b10100000\n  0b11100000\n: im9\n  0b11100000\n  0b11100000\n  0b00100000\n  0b11000000\n: imA\n  0b01000000\n  0b10100000\n  0b11100000\n  0b10100000\n: imB\n  0b11000000\n  0b11100000\n  0b10100000\n  0b11100000\n: imC\n  0b11100000\n  0b10000000\n  0b10000000\n  0b11100000\n: imD\n  0b11000000\n  0b10100000\n  0b10100000\n  0b11000000\n: imE\n  0b11100000\n  0b11000000\n  0b10000000\n  0b11100000\n: imF\n  0b11100000\n  0b10000000\n  0b11000000\n  0b10000000\n: imV\n  0b00000000\n  0b10100000\n  0b10100000\n  0b01000000\n: imX\n  0b10100000\n  0b01000000\n  0b10100000\n  0b10100000\n\n: version\n: version-0-0\n  0x0a 0xae 0xa2 0x42\n: version-1-0\n  0x38 0x08 0x30 0xb8\n\n","options":{"tickrate":20,"fillColor":"#FFCC00","fillColor2":"#FF6600","blendColor":"#662200","backgroundColor":"#996600","buzzColor":"#FFAA00","quietColor":"#000000","shiftQuirks":false,"loadStoreQuirks":false,"vfOrderQuirks":false,"clipQuirks":true,"jumpQuirks":false,"logicQuirks":true,"vBlankQuirks":true,"screenRotation":0,"maxSize":3216,"touchInputMode":"vip","fontStyle":"octo","displayScale":"6"},"rom":[18,10,96,1,0,238,96,2,18,182,0,224,104,50,107,26,165,1,216,180,104,58,165,5,216,180,104,2,105,6,106,11,107,1,101,42,102,43,164,197,216,180,164,253,217,180,164,177,54,42,164,181,54,43,164,177,218,180,107,6,164,201,216,180,164,253,217,180,164,177,69,42,164,181,69,43,164,177,218,180,107,11,164,205,216,180,164,253,217,180,164,177,85,96,164,181,85,80,164,177,218,180,107,16,164,213,216,180,164,253,217,180,164,177,118,255,70,42,164,181,218,180,123,5,164,221,216,180,164,253,217,180,164,177,149,96,164,181,149,176,164,177,218,180,123,5,164,189,216,180,164,253,217,180,164,181,18,160,164,177,218,180,104,18,105,22,106,27,107,1,164,193,216,180,164,253,217,180,96,0,34,2,164,181,64,0,164,177,218,180,123,5,164,185,216,180,164,241,217,180,164,181,64,2,164,177,48,0,218,180,123,5,164,217,216,180,164,185,217,180,164,177,101,42,103,0,135,80,71,42,164,181,218,180,123,5,164,217,216,180,164,189,217,180,164,177,102,11,103,42,135,97,71,43,164,181,218,180,123,5,164,217,216,180,164,193,217,180,164,177,102,120,103,31,135,98,71,24,164,181,218,180,123,5,164,217,216,180,164,197,217,180,164,177,102,120,103,31,135,99,71,103,164,181,218,180,104,34,105,38,106,43,107,1,164,217,216,180,164,201,217,180,164,177,102,140,103,140,135,100,71,24,164,181,218,180,123,5,164,217,216,180,164,205,217,180,164,177,102,140,103,120,135,101,71,236,164,181,218,180,123,5,164,217,216,180,164,213,217,180,164,177,102,120,103,140,135,103,71,236,164,181,218,180,123,5,164,217,216,180,164,209,217,180,164,177,102,15,134,102,70,7,164,181,218,180,123,5,164,217,216,180,164,241,217,180,164,177,102,224,134,110,70,192,164,181,218,180,123,5,164,245,216,180,164,209,217,180,164,174,241,101,164,181,48,170,164,177,49,85,164,177,218,180,104,50,105,54,106,59,107,1,164,245,216,180,164,205,217,180,164,174,96,0,97,48,241,85,164,174,240,101,129,0,164,175,240,101,164,181,48,48,164,177,49,0,164,177,218,180,123,5,164,245,216,180,164,197,217,180,164,174,102,137,246,51,242,101,164,177,48,1,20,66,49,3,20,66,50,7,20,66,164,174,102,65,246,51,242,101,164,177,48,0,20,66,49,6,20,66,50,5,20,66,164,174,102,4,246,51,242,101,164,177,48,0,20,66,49,0,20,66,50,4,20,66,164,181,218,180,123,5,164,245,216,180,164,241,217,180,164,177,102,4,246,30,218,180,123,5,164,249,216,180,164,253,217,180,164,181,102,255,118,10,54,9,164,177,134,102,54,4,164,177,102,255,96,10,134,4,54,9,164,177,134,102,54,4,164,177,102,255,134,110,134,102,54,127,164,177,134,102,134,110,54,126,164,177,102,5,118,246,54,251,164,177,102,5,134,5,54,251,164,177,102,5,128,103,48,251,164,177,218,180,20,172,170,85,0,0,160,64,160,0,160,192,128,224,160,160,224,192,64,64,224,224,32,192,224,224,96,32,224,160,224,32,32,224,192,32,192,96,128,224,224,224,32,64,64,224,224,160,224,224,224,32,192,64,160,224,160,192,224,160,224,224,128,128,224,192,160,160,192,224,192,128,224,224,128,192,128,0,160,160,64,160,64,160,160,10,174,162,66,56,8,48,184]}</script>
 <script>"use strict";
 
 function invertKeymap(k) {
diff --git a/package.json b/package.json
index f19dc96..0e41f53 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "Timendus' CHIP-8 Test Suite",
   "scripts": {
     "start": "npm run scale-splash && npm run build-tests",
-    "scale-splash": "ffmpeg -y -i pictures/splash.png -vf scale=96:-1 -sws_flags neighbor pictures/splash2x.png",
+    "scale-splash": "ffmpeg -y -i pictures/splash.png -vf scale=96:-1 -sws_flags neighbor -update true pictures/splash2x.png",
     "build-tests": "for TEST in ./src/tests/*.8o; do export TEST=`basename ${TEST%.*}`; npm run build-test; done",
     "build-test": "echo \"Building ${TEST}.ch8\" && octopus src/tests/${TEST}.8o bin/${TEST}.8o && octo bin/${TEST}.8o bin/${TEST}.ch8 && octo --options octo-config.json bin/${TEST}.8o docs/${TEST}.html && cat bin/${TEST}.8o | pbcopy"
   },
diff --git a/pictures/splash2x.png b/pictures/splash2x.png
index 189d26f..af168b5 100644
Binary files a/pictures/splash2x.png and b/pictures/splash2x.png differ
diff --git a/src/tests/3-corax+.8o b/src/tests/3-corax+.8o
index fc9fe85..b3d1a01 100644
--- a/src/tests/3-corax+.8o
+++ b/src/tests/3-corax+.8o
@@ -68,7 +68,8 @@
   v5 := 42
   v6 := 43
   drawop im3 imX
-  i := image-ok
+  i := image-no
+  if v6 != 42 then i := image-ok
   if v6 != 43 then i := image-no
   sprite x2 y 4
 
@@ -79,6 +80,7 @@
   drawop im4 imX
   i := image-no
   if v5 == 42 then i := image-ok
+  if v5 == 43 then i := image-no
   sprite x2 y 4
 
 #################
@@ -86,8 +88,9 @@
 
   y := 11
   drawop im5 imX
-  i := image-no
+  i := image-no  
   if v5 != v6 then i := image-ok
+  if v5 != v5 then i := image-no
   sprite x2 y 4
 
 #################
@@ -107,6 +110,7 @@
   drawop im9 imX
   i := image-no
   if v5 == v6 then i := image-ok
+  if v5 == vb then i := image-no
   sprite x2 y 4
 
 #################