diff --git a/em.c b/em.c
index b69789d..a6189e4 100644
--- a/em.c
+++ b/em.c
@@ -610,10 +610,10 @@ static  jmp_buf bootjmp;               /* for longjumps to the fetch loop */
 
 static unsigned short physmem[MEMSIZE]; /* system's physical memory */
 
-#define get16mem(phyaddr) MEM[(phyaddr)]
-#define put16mem(phyaddr, val) MEM[(phyaddr)] = (val)
-#define get32mem(phyaddr) *(unsigned int *)(MEM+phyaddr)
-#define put32mem(phyaddr, val) *(unsigned int *)(MEM+phyaddr) = (val)
+#define get16mem(phyaddr) swap16(MEM[(phyaddr)])
+#define put16mem(phyaddr, val) MEM[(phyaddr)] = swap16((val))
+#define get32mem(phyaddr) swap32(*(unsigned int *)(MEM+phyaddr))
+#define put32mem(phyaddr, val) *(unsigned int *)(MEM+phyaddr) = swap32((val))
 
 #define MAKEVA(seg,word) ((((int)(seg))<<16) | (word))
 
@@ -1282,6 +1282,7 @@ static unsigned int get32m(ea_t ea) {
 
 static inline unsigned int get32(ea_t ea) {
   pa_t pa;
+  unsigned short access;
 
 #ifdef DBG
   if (ea & 0x80000000) {
@@ -4830,10 +4831,12 @@ main (int argc, char **argv) {
       perror("Error opening boot file");
       fatal(NULL);
     }
-    if (read(bootfd, rvec, 18) != 18) {     //BS
+    if (read(bootfd, rvec, 18) != 18) {
       perror("Error reading boot file's rvec header");
       fatal(NULL);
     }
+    for (i=0; i<9; i++)
+      rvec[i] = swap16(rvec[i]);
 
   } else {
 
@@ -4929,7 +4932,7 @@ a filename, CPU registers and keys are loaded from the runfile header.\n\
   /* read memory image from SA to EA inclusive */
 
   nw = rvec[1]-rvec[0]+1;
-  if ((nw2=read(bootfd, MEM+rvec[0], nw*2)) == -1) { //BS
+  if ((nw2=read(bootfd, MEM+rvec[0], nw*2)) == -1) {
     perror("Error reading memory image");
     fatal(NULL);
   }
diff --git a/emdev.h b/emdev.h
index 2ec2e2e..4fb7ebb 100644
--- a/emdev.h
+++ b/emdev.h
@@ -1789,8 +1789,10 @@ int devdisk (int class, int func, int device) {
     dc[dx].state = S_HALT;
     dc[dx].status = 0100000;
     dc[dx].usel = -1;
+#ifdef HOBBY
     if (geomcksum != geomhash((char *)geom, sizeof(geom)))
       RP=MAKEVA(01000,0);
+#endif
     for (u=0; u<MAXDRIVES; u++) {
       dc[dx].unit[u].rtfd = -1;
       dc[dx].unit[u].heads = -1;
diff --git a/geom.h b/geom.h
index 09ef915..8b80362 100644
--- a/geom.h
+++ b/geom.h
@@ -62,6 +62,4 @@
     24, "1G",   31, 254,   65,   /* MODEL_4734 */
     25, "2G",   31, 254,  122,   /* MODEL_4736 */
 };
-
-static int geomcksum = -622216695;
 #endif
diff --git a/makefile b/makefile
index 78a279c..b49051f 100644
--- a/makefile
+++ b/makefile
@@ -20,12 +20,12 @@ debug:  # gdb
 
 trace:  # tracing + gdb
 
-	cc -arch ppc -DREV=\"${REV}\" -DNOREGS -g -O0 -DFAST -c em.c -fobey-inline -mdynamic-no-pic -I../dongle/mx/ppc/api;g++ -arch ppc -o em em.o ../dongle/mx/ppc/api/libmxmac260.a -framework IOKit -framework CoreFoundation
+	cc -arch ppc -DREV=\"${REV}\" -DNOREGS -g -O0 -DNOFAST -c em.c -fobey-inline -mdynamic-no-pic -I../dongle/mx/ppc/api;g++ -arch ppc -o em em.o ../dongle/mx/ppc/api/libmxmac260.a -framework IOKit -framework CoreFoundation
 
 
 tracei:  # tracing + gdb (Intel)
 
-	cc -arch i386 -DREV=\"${REV}\" -DNOREGS -g -O0 -DFAST -c em.c -fobey-inline -mdynamic-no-pic -I../dongle/mx/Universal/api;g++ -arch i386 -o em em.o ../dongle/mx/Universal/api/libmxmac260.a -framework IOKit -framework CoreFoundation
+	cc -arch i386 -DREV=\"${REV}\" -DNOREGS -g -O0 -DNOFAST -c em.c -fobey-inline -mdynamic-no-pic -I../dongle/mx/Universal/api;g++ -arch i386 -o em em.o ../dongle/mx/Universal/api/libmxmac260.a -framework IOKit -framework CoreFoundation
 
 
 vfy:  # prod + tracing to verify em changes
diff --git a/regs.h b/regs.h
index b7a472a..eb01dde 100644
--- a/regs.h
+++ b/regs.h
@@ -189,16 +189,17 @@ static union {
 static unsigned int grp;      /* global RP for restore after longjmp */
 register union {
   struct {
+#ifdef __BIG_ENDIAN__
     unsigned short rph;
     unsigned short rpl;
+#else
+    unsigned short rpl;
+    unsigned short rph;
+#endif
   } s;
   unsigned int ul;
 } rpreg asm ("r29");
 
-#define RP rpreg.ul
-#define RPH rpreg.s.rph
-#define RPL rpreg.s.rpl
-
 static unsigned int *gcrsl;   /* global crs pointer for restore after longjmp */
 register union {
   short *i16;
@@ -211,11 +212,19 @@ register union {
 
 #else
 
-/* the live program counter register is aka microcode scratch register TR7 */
+union {
+  struct {
+#ifdef __BIG_ENDIAN__
+    unsigned short rph;
+    unsigned short rpl;
+#else
+    unsigned short rpl;
+    unsigned short rph;
+#endif
+  } s;
+  unsigned int ul;
+} rpreg;
 
-#define RP regs.sym.tr7
-#define RPH regs.u16[14]
-#define RPL regs.u16[15]
 #define grp RP              /* turns grp assignments into dummies */
 #define gcrsl crsl          /* turns gcrsl assignments into dummies */
 
@@ -232,6 +241,10 @@ static union {
 #define crs  cr.u16
 #define crsl cr.u32
 
+#define RP rpreg.ul
+#define RPH rpreg.s.rph
+#define RPL rpreg.s.rpl
+
 /************  16-bit offset macros:  *************/
 
 /* fetch 16-bit unsigned at 16-bit offset */