diff --git a/cpu.js b/cpu.js
index 421b93c..010c2aa 100755
--- a/cpu.js
+++ b/cpu.js
@@ -17,7 +17,7 @@
 (function(window) {
 // A collection of helper functions.
 var cpu_lib = {
-  reg: {
+  r: {
     p: {
       check_z: function(cpu, val) {
         if(val===0) {
@@ -71,7 +71,7 @@ var TXS = {
     } else {
       cpu.p.n = cpu.r.s >> 15;
     } 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.s);
+    cpu_lib.r.p.check_z(cpu, cpu.r.s);
   }
 };
 
@@ -88,7 +88,7 @@ var TSX = {
       cpu.r.x = cpu.r.s;
       cpu.p.n = cpu.r.x >> 15; 
     }   
-    cpu_lib.reg.p.check_z(cpu, cpu.r.x);
+    cpu_lib.r.p.check_z(cpu, cpu.r.x);
   }
 };
 
@@ -103,7 +103,7 @@ var TRB_absolute = {
         data;
     if(cpu.p.e||cpu.p.m) {
       data = cpu.mmu.read_byte(memory_location);
-      cpu_lib.reg.p.check_z(cpu, data & cpu.r.a);
+      cpu_lib.r.p.check_z(cpu, data & cpu.r.a);
       cpu.mmu.store_byte(memory_location, (~cpu.r.a & data));
     } else {
       cpu.cycle_count+=2;     
@@ -111,7 +111,7 @@ var TRB_absolute = {
       var low_byte = cpu.mmu.read_byte(memory_location),
           high_byte = cpu.mmu.read_byte(memory_location+1);
       data = (high_byte<<8) | low_byte;
-      cpu_lib.reg.p.check_z(cpu, data & cpu.r.a);
+      cpu_lib.r.p.check_z(cpu, data & cpu.r.a);
       data &= ~cpu.r.a;
       cpu.mmu.store_byte(memory_location, data&0xff);
       cpu.mmu.store_byte(memory_location+1, data>>8);
@@ -133,7 +133,7 @@ var TRB_direct_page = {
         data;
     if(cpu.p.e||cpu.p.m) {
       data = cpu.mmu.read_byte(memory_location);
-      cpu_lib.reg.p.check_z(cpu, data & cpu.r.a);
+      cpu_lib.r.p.check_z(cpu, data & cpu.r.a);
       cpu.mmu.store_byte(memory_location, (~cpu.r.a & data));
     } else {
       cpu.cycle_count+=2;  
@@ -141,7 +141,7 @@ var TRB_direct_page = {
       var low_byte = cpu.mmu.read_byte(memory_location),
           high_byte = cpu.mmu.read_byte(memory_location+1);
       data = (high_byte<<8) | low_byte;
-      cpu_lib.reg.p.check_z(cpu, data & cpu.r.a);
+      cpu_lib.r.p.check_z(cpu, data & cpu.r.a);
       data &= ~cpu.r.a;
       cpu.mmu.store_byte(memory_location, data&0xff);
       cpu.mmu.store_byte(memory_location+1, data>>8);
@@ -160,7 +160,7 @@ var TSB_absolute = {
         data;
     if(cpu.p.e||cpu.p.m) {
       data = cpu.mmu.read_byte(memory_location);
-      cpu_lib.reg.p.check_z(cpu, data & cpu.r.a);
+      cpu_lib.r.p.check_z(cpu, data & cpu.r.a);
       cpu.mmu.store_byte(memory_location, (cpu.r.a | data));
     } else {
       cpu.cycle_count+=2;
@@ -168,7 +168,7 @@ var TSB_absolute = {
       var low_byte = cpu.mmu.read_byte(memory_location),
           high_byte = cpu.mmu.read_byte(memory_location+1);
       data = (high_byte<<8) | low_byte;
-      cpu_lib.reg.p.check_z(cpu, data & cpu.r.a);
+      cpu_lib.r.p.check_z(cpu, data & cpu.r.a);
       data |= cpu.r.a;
       cpu.mmu.store_byte(memory_location, data&0xff);
       cpu.mmu.store_byte(memory_location+1, data>>8);
@@ -190,7 +190,7 @@ var TSB_direct_page = {
         data;
     if(cpu.p.e||cpu.p.m) {
       data = cpu.mmu.read_byte(memory_location);
-      cpu_lib.reg.p.check_z(cpu, data & cpu.r.a);
+      cpu_lib.r.p.check_z(cpu, data & cpu.r.a);
       cpu.mmu.store_byte(memory_location, (cpu.r.a | data));
     } else {
       cpu.cycle_count+=2;      
@@ -198,7 +198,7 @@ var TSB_direct_page = {
       var low_byte = cpu.mmu.read_byte(memory_location),
           high_byte = cpu.mmu.read_byte(memory_location+1);
       data = (high_byte<<8) | low_byte;
-      cpu_lib.reg.p.check_z(cpu, data & cpu.r.a);
+      cpu_lib.r.p.check_z(cpu, data & cpu.r.a);
       data |= cpu.r.a;
       cpu.mmu.store_byte(memory_location, data&0xff);
       cpu.mmu.store_byte(memory_location+1, data>>8);
@@ -228,7 +228,7 @@ var BIT_const = {
       and_result = cpu.r.a & ((bytes[1]<<8)|bytes[0]);
     }
 
-    cpu_lib.reg.p.check_z(cpu, and_result);
+    cpu_lib.r.p.check_z(cpu, and_result);
   }
 };
 
@@ -613,7 +613,7 @@ var PLD = {
 
     cpu.p.n = cpu.r.d >> 15;  
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.d);
+    cpu_lib.r.p.check_z(cpu, cpu.r.d);
   }
 };
 
@@ -636,7 +636,7 @@ var PLB = {
 
     cpu.r.dbr = cpu.mmu.pull_byte();
     cpu.p.n = cpu.r.dbr >> 7;
-    cpu_lib.reg.p.check_z(cpu.r.dbr);
+    cpu_lib.r.p.check_z(cpu.r.dbr);
   } 
 };
 
@@ -736,7 +736,7 @@ var PLX = {
       cpu.p.n = cpu.r.x >> 15;
     }
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.x);
+    cpu_lib.r.p.check_z(cpu, cpu.r.x);
   }
 };
 
@@ -775,7 +775,7 @@ var PLY = {
       cpu.p.n = cpu.r.y >> 15;
     }
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.y);
+    cpu_lib.r.p.check_z(cpu, cpu.r.y);
   }
 };
 
@@ -816,7 +816,7 @@ var PLA = {
       cpu.p.n = cpu.r.a >> 15;
     }
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -842,7 +842,7 @@ var ROR_accumulator = {
       cpu.p.n = cpu.r.a >> 15;
     }
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -881,7 +881,7 @@ var ROR_absolute = {
       cpu.mmu.store_byte(memory_location+1, high_byte);
     }
 
-    cpu_lib.reg.p.check_z(cpu, shiftee);
+    cpu_lib.r.p.check_z(cpu, shiftee);
   }
 };
 
@@ -923,7 +923,7 @@ var ROR_direct_page = {
       cpu.mmu.store_byte(memory_location+1, high_byte);
     }
 
-    cpu_lib.reg.p.check_z(cpu, shiftee);
+    cpu_lib.r.p.check_z(cpu, shiftee);
   }
 };
 
@@ -972,7 +972,7 @@ var ROL_accumulator = {
       cpu.p.n = cpu.r.a >> 15;
     }
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -1011,7 +1011,7 @@ var ROL_absolute = {
       cpu.mmu.store_byte(memory_location+1, high_byte);
     }
 
-    cpu_lib.reg.p.check_z(cpu, shiftee);
+    cpu_lib.r.p.check_z(cpu, shiftee);
   }
 };
 
@@ -1053,7 +1053,7 @@ var ROL_direct_page = {
       cpu.mmu.store_byte(memory_location+1, high_byte);
     }
 
-    cpu_lib.reg.p.check_z(cpu, shiftee);
+    cpu_lib.r.p.check_z(cpu, shiftee);
   }
 };
 
@@ -1099,7 +1099,7 @@ var ASL_accumulator = {
       cpu.p.n = cpu.r.a >> 15;
     }   
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -1134,7 +1134,7 @@ var ASL_absolute = {
       cpu.mmu.store_byte(memory_location+1, high_byte);
     }   
 
-    cpu_lib.reg.p.check_z(cpu, shiftee);
+    cpu_lib.r.p.check_z(cpu, shiftee);
   }
 };
 
@@ -1173,7 +1173,7 @@ var ASL_direct_page = {
       cpu.mmu.store_byte(memory_location+1, high_byte);
     }   
 
-    cpu_lib.reg.p.check_z(cpu, shiftee);
+    cpu_lib.r.p.check_z(cpu, shiftee);
   }
 };
 
@@ -1211,7 +1211,7 @@ var LSR_accumulator = {
     cpu.r.a = cpu.r.a >> 1;
 
     cpu.p.n = 0;
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -1244,7 +1244,7 @@ var LSR_absolute = {
     }
 
     cpu.p.n = 0;
-    cpu_lib.reg.p.check_z(cpu, shiftee);
+    cpu_lib.r.p.check_z(cpu, shiftee);
   }
 };
 
@@ -1280,7 +1280,7 @@ var LSR_direct_page = {
     }
 
     cpu.p.n = 0;
-    cpu_lib.reg.p.check_z(cpu, shiftee);
+    cpu_lib.r.p.check_z(cpu, shiftee);
   }
 };
 
@@ -1326,7 +1326,7 @@ var EOR_const = {
       cpu.p.n = cpu.r.a >> 15;
     }
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -1713,7 +1713,7 @@ var ORA_const = {
       cpu.p.n = cpu.r.a >> 15;
     }
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -2101,7 +2101,7 @@ var AND_const = {
       cpu.p.n = cpu.r.a >> 15;
     }
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -2501,7 +2501,7 @@ var CPX_const = {
       cpu.p.n = result >> 15;
     }
 
-    cpu_lib.reg.p.check_z(cpu, result);
+    cpu_lib.r.p.check_z(cpu, result);
   }
 };
 
@@ -2577,7 +2577,7 @@ var CPY_const = {
       cpu.p.n = result >> 15;
     }
 
-    cpu_lib.reg.p.check_z(cpu, result);
+    cpu_lib.r.p.check_z(cpu, result);
   }
 };
 
@@ -2654,7 +2654,7 @@ var CMP_const = {
       cpu.p.n = result >> 15;
     }
 
-    cpu_lib.reg.p.check_z(cpu, result);
+    cpu_lib.r.p.check_z(cpu, result);
   }
 };
 
@@ -3137,7 +3137,7 @@ var SBC_const = {
       }
     }
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -3607,7 +3607,7 @@ var ADC_const = {
       }
     }
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -4331,7 +4331,7 @@ var TYA = {
       cpu.r.a = cpu.r.y;
       cpu.p.n = cpu.r.a >> 15; 
     } 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -4364,7 +4364,7 @@ var TAY = {
       }
     }
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.y);
+    cpu_lib.r.p.check_z(cpu, cpu.r.y);
   }
 };
 
@@ -4390,7 +4390,7 @@ var TXA = {
       cpu.r.a = cpu.r.x; 
       cpu.p.n = cpu.r.a >> 15; 
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -4422,7 +4422,7 @@ var TAX = {
         cpu.p.n = cpu.r.x >> 15;
       }
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.x);
+    cpu_lib.r.p.check_z(cpu, cpu.r.x);
   }
 };
 
@@ -4433,7 +4433,7 @@ var TXY = {
   execute:function(cpu) {
     cpu.cycle_count+=2;
     cpu.r.y = cpu.r.x;
-    cpu_lib.reg.p.check_z(cpu, cpu.r.y);
+    cpu_lib.r.p.check_z(cpu, cpu.r.y);
 
     if(cpu.p.e||cpu.p.x) {
       cpu.p.n = cpu.r.y >> 7;
@@ -4450,7 +4450,7 @@ var TYX = {
   execute:function(cpu) {
     cpu.cycle_count+=2;
     cpu.r.x = cpu.r.y;
-    cpu_lib.reg.p.check_z(cpu, cpu.r.x);
+    cpu_lib.r.p.check_z(cpu, cpu.r.x);
 
     if(cpu.p.e||cpu.p.x) {
       cpu.p.n = cpu.r.y >> 7;
@@ -4476,7 +4476,7 @@ var TCD = {
 
     cpu.p.n = cpu.r.d >> 15;
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.d);
+    cpu_lib.r.p.check_z(cpu, cpu.r.d);
   }
 };
 
@@ -4497,7 +4497,7 @@ var TDC = {
       cpu.p.n = cpu.r.a >> 7; 
     }
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -4540,7 +4540,7 @@ var TSC = {
         cpu.p.n = cpu.r.a >> 15;
       }
 
-      cpu_lib.reg.p.check_z(cpu, cpu.r.s);
+      cpu_lib.r.p.check_z(cpu, cpu.r.s);
     }
   }
 };
@@ -4868,7 +4868,7 @@ var LDA_direct_page_indirect = {
       cpu.r.a = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.a >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -4913,7 +4913,7 @@ var LDA_direct_page_indexed_x_indirect = {
       cpu.r.a = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.a >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -4945,7 +4945,7 @@ var LDA_direct_page_indirect_long = {
       cpu.r.a = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.a >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -4987,7 +4987,7 @@ var LDA_direct_page_indirect_long_indexed_y = {
       cpu.r.a = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.a >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -5021,7 +5021,7 @@ var LDA_direct_page_indirect_indexed_y = {
       cpu.r.a = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.a >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -5047,7 +5047,7 @@ var LDA_direct_page_indexed_x = {
       cpu.r.a = low_byte | (high_byte<<8);
       cpu.p.n = cpu.r.a >> 15;
     } 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -5075,7 +5075,7 @@ var LDA_absolute_indexed_y = {
       cpu.r.a = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.a >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -5103,7 +5103,7 @@ var LDA_absolute_indexed_x = {
       cpu.r.a = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.a >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -5218,7 +5218,7 @@ var LDY_const = {
       cpu.r.y = (bytes[1]<<8)|bytes[0];
       cpu.p.n = cpu.r.y >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.y);
+    cpu_lib.r.p.check_z(cpu, cpu.r.y);
   }
 };
 
@@ -5246,7 +5246,7 @@ var LDY_absolute_indexed_x = {
       cpu.r.y = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.y >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.y);
+    cpu_lib.r.p.check_z(cpu, cpu.r.y);
   }
 };
 
@@ -5272,7 +5272,7 @@ var LDY_direct_page_indexed_x = {
       cpu.r.y = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.y >> 15;
     } 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -5295,7 +5295,7 @@ var LDY_absolute = {
       cpu.r.y = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.y >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.y);
+    cpu_lib.r.p.check_z(cpu, cpu.r.y);
   } 
 };
 
@@ -5321,7 +5321,7 @@ var LDY_direct_page = {
       cpu.r.y = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.y >> 15;
     } 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.y); 
+    cpu_lib.r.p.check_z(cpu, cpu.r.y); 
   }
 };
 
@@ -5348,7 +5348,7 @@ var DEX = {
         cpu.p.n = cpu.r.x >> 15;
       }
 
-      cpu_lib.reg.p.check_z(cpu, cpu.r.x);
+      cpu_lib.r.p.check_z(cpu, cpu.r.x);
     }
   }
 };
@@ -5377,7 +5377,7 @@ var DEY = {
         cpu.p.n = cpu.r.y >> 15;
       }
 
-      cpu_lib.reg.p.check_z(cpu, cpu.r.y);
+      cpu_lib.r.p.check_z(cpu, cpu.r.y);
     }
   }
 };
@@ -5407,7 +5407,7 @@ var DEC_accumulator = {
         cpu.p.n = cpu.r.a >> 15;
       }
 
-      cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+      cpu_lib.r.p.check_z(cpu, cpu.r.a);
     }
   } 
 };
@@ -5431,7 +5431,7 @@ var DEC_absolute = {
         temp--;
         cpu.mmu.store_byte(memory_location, temp);
         cpu.p.n = temp >> 7;
-        cpu_lib.reg.p.check_z(cpu, temp);
+        cpu_lib.r.p.check_z(cpu, temp);
       }
     } else {
       cpu.cycle_count+=2;
@@ -5446,7 +5446,7 @@ var DEC_absolute = {
       } else {
         temp--;
         cpu.p.n = temp >> 15;
-        cpu_lib.reg.p.check_z(cpu, temp);
+        cpu_lib.r.p.check_z(cpu, temp);
       }
 
       cpu.mmu.store_byte(memory_location, temp&0x00ff);
@@ -5474,7 +5474,7 @@ var DEC_absolute_indexed_x = {
         temp--;
         cpu.mmu.store_byte(memory_location, temp);
         cpu.p.n = temp >> 7;
-        cpu_lib.reg.p.check_z(cpu, temp);
+        cpu_lib.r.p.check_z(cpu, temp);
       }
     } else {
       cpu.cycle_count+=2;
@@ -5489,7 +5489,7 @@ var DEC_absolute_indexed_x = {
       } else {
         temp--;
         cpu.p.n = temp >> 15;
-        cpu_lib.reg.p.check_z(cpu, temp);
+        cpu_lib.r.p.check_z(cpu, temp);
       }
 
       cpu.mmu.store_byte(memory_location, temp&0x00ff);
@@ -5520,7 +5520,7 @@ var DEC_direct_page = {
         temp--;
         cpu.mmu.store_byte(memory_location, temp);
         cpu.p.n = temp >> 7;
-        cpu_lib.reg.p.check_z(cpu, temp);
+        cpu_lib.r.p.check_z(cpu, temp);
       }
     } else {
       cpu.cycle_count+=2;
@@ -5535,7 +5535,7 @@ var DEC_direct_page = {
       } else {
         temp--;
         cpu.p.n = temp >> 15;
-        cpu_lib.reg.p.check_z(cpu, temp);
+        cpu_lib.r.p.check_z(cpu, temp);
       }
 
       cpu.mmu.store_byte(memory_location, temp&0x00ff);
@@ -5566,7 +5566,7 @@ var DEC_direct_page_indexed_x = {
         temp--;
         cpu.mmu.store_byte(memory_location, temp);
         cpu.p.n = temp >> 7;
-        cpu_lib.reg.p.check_z(cpu, temp);
+        cpu_lib.r.p.check_z(cpu, temp);
       }
     } else {
       cpu.cycle_count+=2;
@@ -5581,7 +5581,7 @@ var DEC_direct_page_indexed_x = {
       } else {
         temp--;
         cpu.p.n = temp >> 15;
-        cpu_lib.reg.p.check_z(cpu, temp);
+        cpu_lib.r.p.check_z(cpu, temp);
       }
 
       cpu.mmu.store_byte(memory_location, temp&0x00ff);
@@ -5607,7 +5607,7 @@ var INX = {
       cpu.p.n = cpu.r.x >> 15;
     }
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.x);
+    cpu_lib.r.p.check_z(cpu, cpu.r.x);
   }
 };
 
@@ -5628,7 +5628,7 @@ var INY = {
       cpu.p.n = cpu.r.y >> 15;
     }
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.y);
+    cpu_lib.r.p.check_z(cpu, cpu.r.y);
   }
 };
 
@@ -5649,7 +5649,7 @@ var INC_accumulator = {
       cpu.p.n = cpu.r.a >> 15;
     }
 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   } 
 };
 
@@ -5666,7 +5666,7 @@ var INC_absolute = {
       temp = (cpu.mmu.read_byte(memory_location) + 1) & 0xff;
       cpu.p.n = temp >> 7;
       cpu.mmu.store_byte(memory_location, temp);
-      cpu_lib.reg.p.check_z(cpu, temp);
+      cpu_lib.r.p.check_z(cpu, temp);
     } else {
       cpu.cycle_count+=2;
 
@@ -5678,7 +5678,7 @@ var INC_absolute = {
       low_byte = temp & 0x00ff;
       cpu.mmu.store_byte(memory_location, low_byte);
       cpu.mmu.store_byte(memory_location+1, high_byte);
-      cpu_lib.reg.p.check_z(cpu, (high_byte<<8)|low_byte);
+      cpu_lib.r.p.check_z(cpu, (high_byte<<8)|low_byte);
     }
   }
 };
@@ -5696,7 +5696,7 @@ var INC_absolute_indexed_x = {
       temp = (cpu.mmu.read_byte(memory_location) + 1) & 0xff;
       cpu.p.n = temp >> 7;
       cpu.mmu.store_byte(memory_location, temp);
-      cpu_lib.reg.p.check_z(cpu, temp);
+      cpu_lib.r.p.check_z(cpu, temp);
     } else {
       cpu.cycle_count+=2;
 
@@ -5708,7 +5708,7 @@ var INC_absolute_indexed_x = {
       low_byte = temp & 0x00ff;
       cpu.mmu.store_byte(memory_location, low_byte);
       cpu.mmu.store_byte(memory_location+1, high_byte);
-      cpu_lib.reg.p.check_z(cpu, (high_byte<<8)|low_byte);
+      cpu_lib.r.p.check_z(cpu, (high_byte<<8)|low_byte);
     }
   }
 };
@@ -5729,7 +5729,7 @@ var INC_direct_page = {
       temp = (cpu.mmu.read_byte(memory_location) + 1) & 0xff;
       cpu.mmu.store_byte(memory_location, temp);
       cpu.p.n = temp >> 7;
-      cpu_lib.reg.p.check_z(cpu, temp);
+      cpu_lib.r.p.check_z(cpu, temp);
     } else {
       cpu.cycle_count+=2;
 
@@ -5741,7 +5741,7 @@ var INC_direct_page = {
       low_byte = temp & 0x00ff;
       cpu.mmu.store_byte(memory_location, low_byte);
       cpu.mmu.store_byte(memory_location+1, high_byte);
-      cpu_lib.reg.p.check_z(cpu, (high_byte<<8)|low_byte);
+      cpu_lib.r.p.check_z(cpu, (high_byte<<8)|low_byte);
     }
   }
 };
@@ -5762,7 +5762,7 @@ var INC_direct_page_indexed_x = {
       temp = (cpu.mmu.read_byte(memory_location) + 1) & 0xff;
       cpu.mmu.store_byte(memory_location, temp);
       cpu.p.n = temp >> 7;
-      cpu_lib.reg.p.check_z(cpu, temp);
+      cpu_lib.r.p.check_z(cpu, temp);
     } else {
       cpu.cycle_count+=2;
 
@@ -5775,7 +5775,7 @@ var INC_direct_page_indexed_x = {
       low_byte = temp & 0x00ff;
       cpu.mmu.store_byte(memory_location, low_byte);
       cpu.mmu.store_byte(memory_location+1, high_byte);
-      cpu_lib.reg.p.check_z(cpu, (high_byte<<8)|low_byte);
+      cpu_lib.r.p.check_z(cpu, (high_byte<<8)|low_byte);
     }
   }
 };
@@ -6123,7 +6123,7 @@ var LDX_direct_page = {
       cpu.r.x = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.x >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.x);
+    cpu_lib.r.p.check_z(cpu, cpu.r.x);
   }
 };
 
@@ -6149,7 +6149,7 @@ var LDX_direct_page_indexed_y = {
       cpu.r.x = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.x >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.x);
+    cpu_lib.r.p.check_z(cpu, cpu.r.x);
   }
 };
 
@@ -6175,7 +6175,7 @@ var LDA_direct_page = {
       cpu.r.a = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.a >> 15;
     } 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -6203,7 +6203,7 @@ var LDX_absolute_indexed_y = {
       cpu.r.x = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.x >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.x);
+    cpu_lib.r.p.check_z(cpu, cpu.r.x);
   }
 };
 
@@ -6226,7 +6226,7 @@ var LDX_absolute = {
       cpu.r.x = (high_byte<<8) | low_byte; 
       cpu.p.n = cpu.r.x >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.x);
+    cpu_lib.r.p.check_z(cpu, cpu.r.x);
   }
 };
 
@@ -6249,7 +6249,7 @@ var LDA_absolute_long = {
       cpu.r.a = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.a >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -6282,7 +6282,7 @@ var LDA_absolute_long_indexed_x = {
       cpu.r.a = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.a >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -6305,7 +6305,7 @@ var LDA_absolute = {
       cpu.r.a = (high_byte<<8) | low_byte;
       cpu.p.n = cpu.r.a >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -6329,7 +6329,7 @@ var LDA_const = {
       cpu.r.a = (bytes[1]<<8)|bytes[0];  
       cpu.p.n = cpu.r.a >> 15;
     }
-    cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+    cpu_lib.r.p.check_z(cpu, cpu.r.a);
   }
 };
 
@@ -6353,7 +6353,7 @@ var LDX_const = {
       cpu.r.x = (bytes[1]<<8)|bytes[0];  
       cpu.p.n = cpu.r.x >> 15;
     } 
-    cpu_lib.reg.p.check_z(cpu, cpu.r.x);
+    cpu_lib.r.p.check_z(cpu, cpu.r.x);
   }
 };
 
@@ -6514,14 +6514,14 @@ var XBA = {
       cpu.r.b = old_a;
 
       cpu.p.n = cpu.r.a >> 7;
-      cpu_lib.reg.p.check_z(cpu, cpu.r.a);
+      cpu_lib.r.p.check_z(cpu, cpu.r.a);
     } else {
       var low_byte = cpu.r.a & 0xff;
       var high_byte = cpu.r.a >> 8;
       cpu.r.a = (low_byte<<8)|high_byte;
 
       cpu.p.n = high_byte >> 7; 
-      cpu_lib.reg.p.check_z(cpu, high_byte);
+      cpu_lib.r.p.check_z(cpu, high_byte);
     }
   }
 };