diff --git a/mac-cpp-source/Iomega Zip Tester.cpp b/mac-cpp-source/Iomega Tester.cpp
similarity index 93%
rename from mac-cpp-source/Iomega Zip Tester.cpp
rename to mac-cpp-source/Iomega Tester.cpp
index adb4cb3..e4843e2 100644
--- a/mac-cpp-source/Iomega Zip Tester.cpp	
+++ b/mac-cpp-source/Iomega Tester.cpp	
@@ -21,11 +21,10 @@ void main() {
     SIOUXSettings.asktosaveonclose = FALSE;
     SIOUXSettings.standalone = FALSE;
 
-    printf( "SCSI and Iomega Zip/Jaz Toolkit V0.1\n" );
-    printf( "(c) 2021 Marcio Teixeira\n\n" );
-    printf( "TIP based on source code provided by Steve Gibson (http://grc.com)\n" );
+    printf( "This Mac port (c) 2021 Marcio Teixeira       http://github.com/marciot/mac-tip\n" );
+    printf( "Based on code (c) 2006 Gibson Research Corp  http://grc.com/tip/clickdeath.htm\n" );
 
-    SIOUXSetTitle("\pCommand Console");
+    SIOUXSetTitle("\pIomega Tester (Beta) V0.1");
 
     print_help();
 
@@ -42,7 +41,7 @@ void main() {
 bool process_command() {
     short int arg_val = 0;
     char cmd[80];
-    printf( "\n> " );
+    printf( "\nCmd> " );
     gets( cmd );
     printf("\n");
 
@@ -62,6 +61,7 @@ bool process_command() {
         case 't': run_tip(arg_val); break;
         case 'q': return false;
         case 'o': SetRichEditText(arg_str); break;
+        default: printf("Unknown command, type 'h' for help\n");
     }
     return true;
 }
diff --git a/mac-cpp-source/Iomega Tester.rsrc.bin b/mac-cpp-source/Iomega Tester.rsrc.bin
new file mode 100644
index 0000000..044c49e
Binary files /dev/null and b/mac-cpp-source/Iomega Tester.rsrc.bin differ
diff --git a/mac-cpp-source/Iomega Tester.µ.bin b/mac-cpp-source/Iomega Tester.µ.bin
new file mode 100644
index 0000000..ee7f693
Binary files /dev/null and b/mac-cpp-source/Iomega Tester.µ.bin differ
diff --git a/mac-cpp-source/Iomega Zip Tester.rsrc.sit.bin b/mac-cpp-source/Iomega Zip Tester.rsrc.sit.bin
deleted file mode 100644
index 84dace8..0000000
Binary files a/mac-cpp-source/Iomega Zip Tester.rsrc.sit.bin and /dev/null differ
diff --git a/mac-cpp-source/tip/tip_aspi.cpp b/mac-cpp-source/tip/tip_aspi.cpp
index c40ddec..ef5f527 100644
--- a/mac-cpp-source/tip/tip_aspi.cpp
+++ b/mac-cpp-source/tip/tip_aspi.cpp
@@ -748,8 +748,6 @@ long PerformRegionTransfer(short XferCmd, void *pBuffer) {
                 BumpErrorCounts(eax); // given eax, count the errors
                 GetSpareSectorCounts(false); // update the Cart's Condition
                 UpdateRunTimeDisplay();
-
-                if(UserInterrupt) break;
             }
             LocalBuffer += BYTES_PER_SECTOR;
             SingleTransferLBA++;
@@ -844,7 +842,7 @@ void TestTheDisk() {
 
         long eax = PerformRegionTransfer(SCSI_Cmd_ReadMany, pUserDataBuffer);
 
-        /*if(eax == 0) {
+        if(eax == 0) {
             // -------------------------------
             TestingPhase = WRITING_PATT;
             UpdateRunPhaseDisplay();
@@ -864,7 +862,7 @@ void TestTheDisk() {
         }
         if (CartridgeStatus != DISK_TEST_UNDERWAY) {
             break;
-        }*/
+        }
         // bump the FirstLBASector up for the next transfer
         FirstLBASector += NumberOfLBAs;
     } while(!UserInterrupt);
diff --git a/mac-cpp-source/utils/.rsrc/FileLib.c b/mac-cpp-source/utils/.rsrc/FileLib.c
deleted file mode 100644
index 090b269..0000000
Binary files a/mac-cpp-source/utils/.rsrc/FileLib.c and /dev/null differ
diff --git a/mac-cpp-source/utils/.rsrc/FileLib.h b/mac-cpp-source/utils/.rsrc/FileLib.h
deleted file mode 100644
index 1b2c2f5..0000000
Binary files a/mac-cpp-source/utils/.rsrc/FileLib.h and /dev/null differ
diff --git a/mac-cpp-source/utils/.rsrc/LaunchLib.c b/mac-cpp-source/utils/.rsrc/LaunchLib.c
deleted file mode 100644
index 62e03d0..0000000
Binary files a/mac-cpp-source/utils/.rsrc/LaunchLib.c and /dev/null differ
diff --git a/mac-cpp-source/utils/.rsrc/LaunchLib.h b/mac-cpp-source/utils/.rsrc/LaunchLib.h
deleted file mode 100644
index 8178a02..0000000
Binary files a/mac-cpp-source/utils/.rsrc/LaunchLib.h and /dev/null differ
diff --git a/mac-cpp-source/utils/.rsrc/PascalLib.c b/mac-cpp-source/utils/.rsrc/PascalLib.c
deleted file mode 100644
index 845a837..0000000
Binary files a/mac-cpp-source/utils/.rsrc/PascalLib.c and /dev/null differ
diff --git a/mac-cpp-source/utils/.rsrc/PascalLib.h b/mac-cpp-source/utils/.rsrc/PascalLib.h
deleted file mode 100644
index a806bdc..0000000
Binary files a/mac-cpp-source/utils/.rsrc/PascalLib.h and /dev/null differ
diff --git a/mac-cpp-source/utils/.rsrc/TrapAvail.c b/mac-cpp-source/utils/.rsrc/TrapAvail.c
deleted file mode 100644
index e7f16a0..0000000
Binary files a/mac-cpp-source/utils/.rsrc/TrapAvail.c and /dev/null differ
diff --git a/mac-cpp-source/utils/.rsrc/TrapAvail.h b/mac-cpp-source/utils/.rsrc/TrapAvail.h
deleted file mode 100644
index a296974..0000000
Binary files a/mac-cpp-source/utils/.rsrc/TrapAvail.h and /dev/null differ
diff --git a/mac-cpp-source/utils/.rsrc/pstring.h b/mac-cpp-source/utils/.rsrc/pstring.h
deleted file mode 100644
index dcb17c3..0000000
Binary files a/mac-cpp-source/utils/.rsrc/pstring.h and /dev/null differ