diff --git a/scp.c b/scp.c
index 47f17ba..ac1b0e7 100644
--- a/scp.c
+++ b/scp.c
@@ -32,26 +32,26 @@
                         REG "maxval" field now determines maximum allowed value
    08-Mar-16    RMS     Added shutdown flag for detach_all
    20-Mar-12    MP      Fixes to "SHOW <x> SHOW" commands
-   06-Jan-12    JDB     Fixed "SHOW DEVICE" with only one enabled unit (Dave Bryan)  
-   25-Sep-11    MP      Added the ability for a simulator built with 
+   06-Jan-12    JDB     Fixed "SHOW DEVICE" with only one enabled unit (Dave Bryan)
+   25-Sep-11    MP      Added the ability for a simulator built with
                         SIM_ASYNCH_IO to change whether I/O is actually done
-                        asynchronously by the new scp command SET ASYNCH and 
+                        asynchronously by the new scp command SET ASYNCH and
                         SET NOASYNCH
-   22-Sep-11    MP      Added signal catching of SIGHUP and SIGTERM to cause 
+   22-Sep-11    MP      Added signal catching of SIGHUP and SIGTERM to cause
                         simulator STOP.  This allows an externally signalled
                         event (i.e. system shutdown, or logoff) to signal a
-                        running simulator of these events and to allow 
-                        reasonable actions to be taken.  This will facilitate 
-                        running a simulator as a 'service' on *nix platforms, 
-                        given a sufficiently flexible simulator .ini file.  
+                        running simulator of these events and to allow
+                        reasonable actions to be taken.  This will facilitate
+                        running a simulator as a 'service' on *nix platforms,
+                        given a sufficiently flexible simulator .ini file.
    20-Apr-11    MP      Added expansion of %STATUS% and %TSTATUS% in do command
-                        arguments.  STATUS is the numeric value of the last 
+                        arguments.  STATUS is the numeric value of the last
                         command error status and TSTATUS is the text message
                         relating to the last command error status
    17-Apr-11    MP      Changed sim_rest to defer attaching devices until after
                         device register contents have been restored since some
                         attach activities may reference register contained info.
-   29-Jan-11    MP      Adjusted sim_debug to: 
+   29-Jan-11    MP      Adjusted sim_debug to:
                           - include the simulator timestamp (sim_gtime)
                             as part of the prefix for each line of output
                           - write complete lines at a time (avoid asynch I/O issues).
@@ -260,7 +260,7 @@
 #define MIN(a,b)  (((a) <= (b)) ? (a) : (b))
 #endif
 /* Max width of a value expressed as a formatted string */
-#define MAX_WIDTH ((int) ((CHAR_BIT * sizeof (t_value) * 4 + 3)/3))
+#define MAX_WIDTH ((CHAR_BIT * sizeof (t_value) * 4 + 3) / 3)
 
 
 /* search logical and boolean ops */
@@ -360,10 +360,10 @@ return "SCP Event and Internal Command Processing and Testing";
 static UNIT scp_test_units[4];
 
 DEVICE sim_scp_dev = {
-    "SCP-PROCESS", scp_test_units, NULL, NULL, 
-    4, 0, 0, 0, 0, 0, 
-    NULL, NULL, NULL, NULL, NULL, NULL, 
-    NULL, DEV_NOSAVE|DEV_DEBUG, 0, 
+    "SCP-PROCESS", scp_test_units, NULL, NULL,
+    4, 0, 0, 0, 0, 0,
+    NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL, DEV_NOSAVE|DEV_DEBUG, 0,
     scp_debug, NULL, NULL, NULL, NULL, NULL,
     sim_scp_description};
 
@@ -449,13 +449,13 @@ t_bool sim_asynch_enabled = FALSE;
 #endif
 
 /* The per-simulator init routine is a weak global that defaults to NULL
-   The other per-simulator pointers can be overrriden by the init routine
+   The other per-simulator pointers can be overridden by the init routine
 
 WEAK void (*sim_vm_init) (void);
 
    This routine is no longer invoked this way since it doesn't work reliably
-   on all simh supported compile environments.  A simulator that needs these 
-   initializations can perform them in the CPU device reset routine which will 
+   on all simh supported compile environments.  A simulator that needs these
+   initializations can perform them in the CPU device reset routine which will
    always be called before anything else can be processed.
 
  */
@@ -695,10 +695,10 @@ return "Step/Next facility";
 
 static UNIT sim_step_unit = { UDATA (&step_svc, UNIT_IDLE, 0) };
 DEVICE sim_step_dev = {
-    "INT-STEP", &sim_step_unit, NULL, NULL, 
-    1, 0, 0, 0, 0, 0, 
-    NULL, NULL, NULL, NULL, NULL, NULL, 
-    NULL, DEV_NOSAVE, 0, 
+    "INT-STEP", &sim_step_unit, NULL, NULL,
+    1, 0, 0, 0, 0, 0,
+    NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL, DEV_NOSAVE, 0,
     NULL, NULL, NULL, NULL, NULL, NULL,
     sim_int_step_description};
 
@@ -720,10 +720,10 @@ return SCPE_OK;
 
 static UNIT sim_runlimit_unit = { UDATA (&runlimit_svc, UNIT_IDLE, 0) };
 DEVICE sim_runlimit_dev = {
-    "INT-RUNLIMIT", &sim_runlimit_unit, NULL, NULL, 
-    1, 0, 0, 0, 0, 0, 
-    NULL, NULL, &sim_int_runlimit_reset, NULL, NULL, NULL, 
-    NULL, DEV_NOSAVE, 0, 
+    "INT-RUNLIMIT", &sim_runlimit_unit, NULL, NULL,
+    1, 0, 0, 0, 0, 0,
+    NULL, NULL, &sim_int_runlimit_reset, NULL, NULL, NULL,
+    NULL, DEV_NOSAVE, 0,
     NULL, NULL, NULL, NULL, NULL, NULL,
     sim_int_runlimit_description};
 
@@ -734,10 +734,10 @@ return "Expect facility";
 
 static UNIT sim_expect_unit = { UDATA (&expect_svc, 0, 0) };
 DEVICE sim_expect_dev = {
-    "INT-EXPECT", &sim_expect_unit, NULL, NULL, 
-    1, 0, 0, 0, 0, 0, 
-    NULL, NULL, NULL, NULL, NULL, NULL, 
-    NULL, DEV_NOSAVE, 0, 
+    "INT-EXPECT", &sim_expect_unit, NULL, NULL,
+    1, 0, 0, 0, 0, 0,
+    NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL, DEV_NOSAVE, 0,
     NULL, NULL, NULL, NULL, NULL, NULL,
     sim_int_expect_description};
 
@@ -754,10 +754,10 @@ static REG sim_flush_reg[] = {
 
 static UNIT sim_flush_unit = { UDATA (&flush_svc, UNIT_IDLE, 0) };
 DEVICE sim_flush_dev = {
-    "INT-FLUSH", &sim_flush_unit, sim_flush_reg, NULL, 
-    1, 0, 0, 0, 0, 0, 
-    NULL, NULL, NULL, NULL, NULL, NULL, 
-    NULL, DEV_NOSAVE, 0, 
+    "INT-FLUSH", &sim_flush_unit, sim_flush_reg, NULL,
+    1, 0, 0, 0, 0, 0,
+    NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL, DEV_NOSAVE, 0,
     NULL, NULL, NULL, NULL, NULL, NULL,
     sim_int_flush_description};
 
@@ -1410,7 +1410,7 @@ static const char simh_help1[] =
       " RADIX-50 characters.\n"
       "5-F\n"
       " The -F switch causes duplicate successive lines of debug NOT to be\n"
-      " summarized to reduce repetative noise from the debug data stream.\n"
+      " summarized to reduce repetitive noise from the debug data stream.\n"
       "5-E\n"
       " The -E switch causes data blob output to also display the data as\n"
       " EBCDIC characters.\n"
@@ -1575,16 +1575,16 @@ static const char simh_help2[] =
       "+sh{ow} cons{ole} {arg}      show console options\n"
       "+sh{ow} {-ei} dev{ices}      show devices\n"
       "+sh{ow} fea{tures}           show system devices with descriptions\n"
-      "+sh{ow} m{odifiers}          show modifiers for all devices\n" 
-      "+sh{ow} s{how}               show SHOW commands for all devices\n" 
+      "+sh{ow} m{odifiers}          show modifiers for all devices\n"
+      "+sh{ow} s{how}               show SHOW commands for all devices\n"
       "+sh{ow} n{ames}              show logical names\n"
       "+sh{ow} q{ueue}              show event queue\n"
       "+sh{ow} ti{me}               show simulated time\n"
       "+sh{ow} th{rottle}           show simulation rate\n"
-      "+sh{ow} a{synch}             show asynchronous I/O state\n" 
+      "+sh{ow} a{synch}             show asynchronous I/O state\n"
       "+sh{ow} ve{rsion}            show simulator version\n"
-      "+sh{ow} def{ault}            show current directory\n" 
-      "+sh{ow} re{mote}             show remote console configuration\n" 
+      "+sh{ow} def{ault}            show current directory\n"
+      "+sh{ow} re{mote}             show remote console configuration\n"
       "+sh{ow} <dev> RADIX          show device display radix\n"
       "+sh{ow} <dev> DEBUG          show device debug flags\n"
       "+sh{ow} <dev> MODIFIERS      show device modifiers\n"
@@ -1636,7 +1636,7 @@ static const char simh_help2[] =
        /***************** 80 character line width template *************************/
       "2HELP\n"
       "+h{elp}                      type this message\n"
-      "+h{elp} <command>            type help for command\n" 
+      "+h{elp} <command>            type help for command\n"
       "+h{elp} <dev>                type help for device\n"
       "+h{elp} <dev> registers      type help for device register variables\n"
       "+h{elp} <dev> attach         type help for device specific ATTACH command\n"
@@ -1707,7 +1707,7 @@ static const char simh_help2[] =
       "+The input sequence \"%%%%\" represents a literal \"%%\".  All other\n"
       "+character combinations are rendered literally.\n\n"
       "+Omitted parameters result in null-string substitutions.\n\n"
-      "+Tokens preceeded and followed by %% characters are expanded as environment\n"
+      "+Tokens preceded and followed by %% characters are expanded as environment\n"
       "+variables, and if an environment variable isn't found then it can be one of\n"
       "+several special variables:\n\n"
       "++%%DATE%%              yyyy-mm-dd\n"
@@ -1747,10 +1747,10 @@ static const char simh_help2[] =
       "++%%SIM_OSTYPE%%        The Operating System running the current simulator\n\n"
       "+Environment variable lookups are done first with the precise name between\n"
       "+the %% characters and if that fails, then the name between the %% characters\n"
-      "+is upcased and a lookup of that valus is attempted.\n\n"
+      "+is upcased and a lookup of that value is attempted.\n\n"
       "+The first Space delimited token on the line is extracted in uppercase and\n"
       "+then looked up as an environment variable.  If found it the value is\n"
-      "+supstituted for the original string before expanding everything else.  If\n"
+      "+substituted for the original string before expanding everything else.  If\n"
       "+it is not found, then the original beginning token on the line is left\n"
       "+untouched.\n\n"
       "+Environment variable string substitution:\n\n"
@@ -1789,7 +1789,7 @@ static const char simh_help2[] =
       "++%%~nxI%%   - expands the value of %%I%% to a file name and extension only\n\n"
       " In the above example above %%I%% can be replaced by other\n"
       " environment variables or numeric parameters to a DO command\n"
-      " invokation.\n"
+      " invocation.\n"
       " Examples:\n\n"
       "++sim> set env FNAME='xyzzy.ini'\n"
       "++sim> echo ~FNAME=%%~FNAME%%\n"
@@ -1804,7 +1804,7 @@ static const char simh_help2[] =
       "3GOTO\n"
       " Commands in a command file execute in sequence until either an error\n"
       " trap occurs (when a command completes with an error status), or when an\n"
-      " explict request is made to start command execution elsewhere with the\n"
+      " explicit request is made to start command execution elsewhere with the\n"
       " GOTO command:\n\n"
       "++GOTO <label>\n\n"
       " Labels are lines in a command file which the first non whitespace\n"
@@ -2081,7 +2081,7 @@ static const char simh_help2[] =
       "++\\e  Sends the ASCII Escape character (Decimal value 27)\n"
       " as well as octal character values of the form:\n"
       "++\\n{n{n}} where each n is an octal digit (0-7)\n"
-      " and hext character values of the form:\n"
+      " and hex character values of the form:\n"
       "++\\xh{h} where each h is a hex digit (0-9A-Fa-f)\n"
        /***************** 80 character line width template *************************/
 #define HLP_SEND        "*Commands Executing_Command_Files Injecting_Console_Input"
@@ -2142,7 +2142,7 @@ static const char simh_help2[] =
       "++\\e  Sends the ASCII Escape character (Decimal value 27)\n"
       " as well as octal character values of the form:\n"
       "++\\n{n{n}} where each n is an octal digit (0-7)\n"
-      " and hext character values of the form:\n"
+      " and hex character values of the form:\n"
       "++\\xh{h} where each h is a hex digit (0-9A-Fa-f)\n"
       "4Switches\n"
       " Switches can be used to influence the behavior of SEND commands\n\n"
@@ -2241,7 +2241,7 @@ static const char simh_help2[] =
       "++\\e  Expect the ASCII Escape character (Decimal value 27)\n"
       " as well as octal character values of the form:\n"
       "++\\n{n{n}} where each n is an octal digit (0-7)\n"
-      " and hext character values of the form:\n"
+      " and hex character values of the form:\n"
       "++\\xh{h} where each h is a hex digit (0-9A-Fa-f)\n"
       "4HaltAfter\n"
       " Specifies the number of %C which should be executed before\n"
@@ -2439,7 +2439,7 @@ static const char simh_help2[] =
       "++sim> SET SCP-PROCESS DEBUG=EXPEVAL   - Expression Evaluation Activities\n"
       "3Debugging Do File Processing\n"
       " Debug output can be produced which will walk through the details\n"
-      " involved during DO file proccessing.  This output can, for example,\n"
+      " involved during DO file processing.  This output can, for example,\n"
       " be enabled as follows:\n\n"
       "++sim> SET DEBUG STDOUT\n"
       "++sim> SET SCP-PROCESS DEBUG=DO  - Debug Output DO processing\n"
@@ -2496,7 +2496,7 @@ static const char simh_help2[] =
       " Many tests are capable of producing various amounts of debug output\n"
       " during their execution.  The -d switch enables that output\n"
       "2File Tools\n"
-      " Tools to manipulate file containers and to tranfer files/data into or\n"
+      " Tools to manipulate file containers and to transfer files/data into or\n"
       " out of a simulated environment are provided.\n\n"
       " In general, these are tools natively found on the host operating system.\n"
       " They are explicitly supported directly from SCP to allow for platform\n"
@@ -2738,6 +2738,7 @@ char cbuf[4*CBUFSIZE], *cptr, *cptr2;
 char nbuf[PATH_MAX + 7];
 char **targv = NULL;
 int32 i, sw;
+int first_arg = -1;
 t_bool lookswitch;
 t_bool register_check = FALSE;
 t_stat stat = SCPE_OK;
@@ -2781,8 +2782,9 @@ for (i = 1; i < argc; i++) {                            /* loop thru args */
             return EXIT_FAILURE;
             }
         if (*cbuf)                                      /* concat args */
-            strlcat (cbuf, " ", sizeof (cbuf)); 
+            strlcat (cbuf, " ", sizeof (cbuf));
         sprintf(&cbuf[strlen(cbuf)], "%s%s%s", strchr(argv[i], ' ') ? "\"" : "", argv[i], strchr(argv[i], ' ') ? "\"" : "");
+        first_arg = i;
         lookswitch = FALSE;                             /* no more switches */
         }
     }                                                   /* end for */
@@ -2792,7 +2794,7 @@ if (*argv[0]) {                                         /* sim name arg? */
     strlcpy (nbuf, argv[0], PATH_MAX + 2);              /* copy sim name */
     if ((np = (char *)match_ext (nbuf, "EXE")))         /* remove .exe */
         *np = 0;
-    np = strrchr (nbuf, '/');                           /* stript path and try again in cwd */
+    np = strrchr (nbuf, '/');                           /* strip path and try again in cwd */
     if (np == NULL)
         np = strrchr (nbuf, '\\');                      /* windows path separator */
     if (np == NULL)
@@ -2883,7 +2885,7 @@ if ((stat = reset_all_p (0)) != SCPE_OK) {
     goto cleanup_and_exit;
     }
 if (register_check) {
-    /* This test is explicitly run after the above reset_all_p() so that any devices 
+    /* This test is explicitly run after the above reset_all_p() so that any devices
        which dynamically manipulate their register lists have already done that. */
     sim_printf (" Running internal register sanity checks on %s simulator.\n", sim_name);
     if ((stat = sim_sanity_check_register_declarations (NULL)) != SCPE_OK) {
@@ -2894,7 +2896,7 @@ if (register_check) {
         goto cleanup_and_exit;
         }
     sim_printf ("*** Good Registers in %s simulator.\n", sim_name);
-    if (argc < 2) {                                 /* No remaining command arguments? */
+    if (first_arg < 0) {                            /* No remaining command arguments? */
         sim_exit_status = EXIT_SUCCESS;             /* then we're done */
         goto cleanup_and_exit;
         }
@@ -2954,7 +2956,7 @@ if (docmdp) {
             strlcat (nbuf, ".ini\"", sizeof (nbuf));       /* add .ini" */
             stat = docmdp->action (-1, nbuf) & ~SCPE_NOMESSAGE; /* proc default cmd file */
             if (stat == SCPE_OPENERR) {                    /* didn't exist/can't open? */
-                np = strrchr (nbuf, '/');                  /* stript path and try again in cwd */
+                np = strrchr (nbuf, '/');                  /* strip path and try again in cwd */
                 if (np == NULL)
                     np = strrchr (nbuf, '\\');             /* windows path separator */
                 if (np == NULL)
@@ -2998,7 +3000,7 @@ stat = SCPE_BARE_STATUS(stat);                          /* remove possible flag
 while (stat != SCPE_EXIT) {                             /* in case exit */
     if (stop_cpu) {                                     /* SIGINT happened? */
         stop_cpu = FALSE;
-        if ((!sim_ttisatty()) || 
+        if ((!sim_ttisatty()) ||
             sigterm_received) {
             stat = SCPE_EXIT;
             break;
@@ -3051,7 +3053,7 @@ while (stat != SCPE_EXIT) {                             /* in case exit */
         }
     else
         stat = SCPE_UNK;
-    stat_nomessage = stat & SCPE_NOMESSAGE;             /* extract possible message supression flag */
+    stat_nomessage = stat & SCPE_NOMESSAGE;             /* extract possible message suppression flag */
     stat_nomessage = stat_nomessage || (!sim_show_message);/* Apply global suppression */
     stat = SCPE_BARE_STATUS(stat);                      /* remove possible flag */
     sim_last_cmd_stat = stat;                           /* save command error status */
@@ -3062,7 +3064,7 @@ while (stat != SCPE_EXIT) {                             /* in case exit */
             if (stat >= SCPE_BASE)                      /* error? */
                 sim_printf ("%s\n", sim_error_text (stat));
         }
-    if ((sim_on_check[sim_do_depth]) && 
+    if ((sim_on_check[sim_do_depth]) &&
         (stat != SCPE_OK)) {
         if ((stat <= SCPE_MAX_ERR) && sim_on_actions[sim_do_depth][stat])
             sim_brk_setact (sim_on_actions[sim_do_depth][stat]);
@@ -3072,7 +3074,7 @@ while (stat != SCPE_EXIT) {                             /* in case exit */
     if (sim_vm_post != NULL)
         (*sim_vm_post) (TRUE);
     }                                                   /* end while */
-if (do_called && cmdp && 
+if (do_called && cmdp &&
     (cmdp->action == &return_cmd) && (0 != *cptr)) {    /* return command with argument? */
     sim_string_to_stat (cptr, &stat);
     sim_last_cmd_stat = stat;                           /* save explicit status as command error status */
@@ -3356,8 +3358,8 @@ else {
     if (side_effects)
         fprintf (st, "\n  +  Deposits to %s register%s will have some additional\n"
                        "     side effects which can be suppressed if the deposit is\n"
-                       "     done with the -Z switch specified\n", 
-                                 (side_effects == 1) ? "this" : "these", 
+                       "     done with the -Z switch specified\n",
+                                 (side_effects == 1) ? "this" : "these",
                                  (side_effects == 1) ? "" : "s");
     }
 }
@@ -3448,7 +3450,7 @@ if (dptr->modifiers) {
                 const char *rem;
 
                 rem = get_glyph (mptr->help, gbuf, 0);
-                if ((strcasecmp (gbuf, "Display") == 0) || 
+                if ((strcasecmp (gbuf, "Display") == 0) ||
                     (strcasecmp (gbuf, "Show") == 0)) {
                     char *thelp = (char *)malloc (9 + strlen (rem));
 
@@ -3548,7 +3550,7 @@ if ((dptr->modifiers) && (dptr->units)) {   /* handle unit specific modifiers */
                 const char *rem;
 
                 rem = get_glyph (mptr->help, gbuf, 0);
-                if ((strcasecmp (gbuf, "Display") == 0) || 
+                if ((strcasecmp (gbuf, "Display") == 0) ||
                     (strcasecmp (gbuf, "Show") == 0)) {
                     char *thelp = (char *)malloc (9 + strlen (rem));
 
@@ -3567,7 +3569,7 @@ if ((dptr->modifiers) && (dptr->units)) {   /* handle unit specific modifiers */
 if (enabled_units) {
     for (unit=0; unit < dptr->numunits; unit++)
         if ((!(dptr->units[unit].flags & UNIT_DIS)) &&
-            (dptr->units[unit].flags & UNIT_SEQ) && 
+            (dptr->units[unit].flags & UNIT_SEQ) &&
             (!(dptr->units[unit].flags & UNIT_MUSTBUF))) {
             snprintf (buf, sizeof (buf), "set %s%s APPEND", sim_uname (&dptr->units[unit]), (enabled_units > 1) ? "n" : "");
             snprintf (extra, sizeof (extra), "Sets %s%s position to EOF", sim_uname (&dptr->units[unit]), (enabled_units > 1) ? "n" : "");
@@ -3797,7 +3799,7 @@ if (*cptr) {
         cptr = get_glyph (cptr, gbuf, 0);
         }
     dptr = find_unit (gbuf, &uptr);
-    if ((dptr == NULL) && 
+    if ((dptr == NULL) &&
         ((dptr = find_dev (gbuf)) == NULL)) {
         if (explicit_device) {
             int i;
@@ -3851,7 +3853,7 @@ if (*cptr) {
                     for (i = 0; (dptr = sim_devices[i]) != NULL; i++) {
                         if (dptr->help)
                             sim_printf ("h{elp} %-17s display help for device %s\n", dptr->name, dptr->name);
-                        if (dptr->attach_help || 
+                        if (dptr->attach_help ||
                             (DEV_TYPE(dptr) == DEV_MUX) ||
                             (DEV_TYPE(dptr) == DEV_DISK) ||
                             (DEV_TYPE(dptr) == DEV_TAPE)) {
@@ -3893,7 +3895,7 @@ if (*cptr) {
 
                 for (cmdpa=cmd_table; cmdpa->name != NULL; cmdpa++)
                     if ((cmdpa->action == cmdp->action) && (cmdpa->help)) {
-                        sim_printf ("%s is an alias for the %s command:\n%s", 
+                        sim_printf ("%s is an alias for the %s command:\n%s",
                                     cmdp->name, cmdpa->name, cmdpa->help);
                         break;
                         }
@@ -4056,7 +4058,7 @@ CONST char *cptr;
 FILE *fpin = NULL;
 CTAB *cmdp = NULL;
 int32 echo, nargs, errabort, i;
-int32 saved_sim_do_echo = sim_do_echo, 
+int32 saved_sim_do_echo = sim_do_echo,
       saved_sim_show_message = sim_show_message,
       saved_sim_on_inherit = sim_on_inherit,
       saved_sim_quiet = sim_quiet;
@@ -4137,7 +4139,7 @@ if (NULL == (c = sim_filepath_parts (cbuf, "f"))) {
     stat = SCPE_MEM;
     goto Cleanup_Return;
     }
-strlcpy( sim_do_filename[sim_do_depth], strcasecmp (cbuf, "<stdin>") ? c : cbuf, 
+strlcpy( sim_do_filename[sim_do_depth], strcasecmp (cbuf, "<stdin>") ? c : cbuf,
          sizeof (sim_do_filename[sim_do_depth]));       /* stash away full path of do file name for possible use by 'call' command */
 free (c);
 sim_do_label[sim_do_depth] = label;                     /* stash away do label for possible use in messages */
@@ -4220,7 +4222,7 @@ do {
         stat = SCPE_UNK;                                /* bad cmd given */
     sim_debug (SIM_DBG_DO, &sim_scp_dev, "Command '%s', Result: 0x%X - %s\n", cmdp ? cmdp->name : "", stat, sim_error_text (stat));
     echo = sim_do_echo;                                 /* Allow for SET VERIFY */
-    stat_nomessage = stat & SCPE_NOMESSAGE;             /* extract possible message supression flag */
+    stat_nomessage = stat & SCPE_NOMESSAGE;             /* extract possible message suppression flag */
     stat_nomessage = stat_nomessage || (!sim_show_message);/* Apply global suppression */
     stat = SCPE_BARE_STATUS(stat);                      /* remove possible flag */
     if (((stat != SCPE_OK) && (stat != SCPE_EXPECT)) ||
@@ -4263,7 +4265,7 @@ do {
     if (stat == SCPE_EXPECT)                            /* EXPECT status is non actionable */
         stat = SCPE_OK;                                 /* so adjust it to SCPE_OK */
     if (staying &&
-        (sim_on_check[sim_do_depth]) && 
+        (sim_on_check[sim_do_depth]) &&
         (stat != SCPE_OK)) {
         if ((stat <= SCPE_MAX_ERR) && sim_on_actions[sim_do_depth][stat])
             sim_brk_setact (sim_on_actions[sim_do_depth][stat]);
@@ -4313,8 +4315,8 @@ return stat | SCPE_NOMESSAGE;                           /* suppress message sinc
    main_like_routine =  the routine that is to be called with parsed arguments
    cptr              =  the command argument string to be broken down into argc, argv
 
-   When the main_like_routine is called, argc and argv are populated.  
-   
+   When the main_like_routine is called, argc and argv are populated.
+
       argc is the number of tokens parsed from the input string plus 1
       argv is an array of parsed tokens where argv[0] is the unparsed input string
 
@@ -4377,25 +4379,25 @@ return result;
 }
 
 /* Substitute_args - replace %n tokens in 'instr' with the do command's arguments
-                     and other enviroment variables
+                     and other environment variables
 
    Calling sequence
    instr        =       input string
    instr_size   =       sizeof input string buffer
    do_arg[10]   =       arguments
 
-   Token %0 expands to the command file name. 
+   Token %0 expands to the command file name.
    Token %n (n being a single digit) expands to the n'th argument
-   Tonen %* expands to the whole set of arguments (%1 ... %9)
+   Token %* expands to the whole set of arguments (%1 ... %9)
 
-   The input sequence "%%" represents a literal "%".  All other 
+   The input sequence "%%" represents a literal "%".  All other
    character combinations are rendered literally.
 
    Omitted parameters result in null-string substitutions.
 
-   Tokens preceeded and followed by % characters are expanded as environment
-   variables, and if one isn't found then can be one of several special 
-   variables: 
+   Tokens preceded and followed by % characters are expanded as environment
+   variables, and if one isn't found then can be one of several special
+   variables:
           %DATE%              yyyy-mm-dd
           %TIME%              hh:mm:ss
           %DATETIME%          yyyy-mm-ddThh:mm:ss
@@ -4408,14 +4410,14 @@ return result;
           %SIM_VERBOSE%       The Verify/Verbose mode of the current Do command file
           %SIM_QUIET%         The Quiet mode of the current Do command file
           %SIM_MESSAGE%       The message display status of the current Do command file
-   Environment variable lookups are done first with the precise name between 
+   Environment variable lookups are done first with the precise name between
    the % characters and if that fails, then the name between the % characters
-   is upcased and a lookup of that valus is attempted.
+   is upcased and a lookup of that value is attempted.
 
-   The first Space delimited token on the line is extracted in uppercase and 
-   then looked up as an environment variable.  If found it the value is 
-   supstituted for the original string before expanding everything else.  If 
-   it is not found, then the original beginning token on the line is left 
+   The first Space delimited token on the line is extracted in uppercase and
+   then looked up as an environment variable.  If found it the value is
+   substituted for the original string before expanding everything else.  If
+   it is not found, then the original beginning token on the line is left
    untouched.
 */
 
@@ -4637,7 +4639,7 @@ if (!ap) {                              /* no environment variable found? */
         int leaps = days/4 - days/100 + days/400;
         int lyear = ((year % 4) == 0) && (((year % 100) != 0) || ((year % 400) == 0));
         int selector = ((days + leaps + 7) % 7) + lyear * 7;
-        static int years[] = {90, 91, 97, 98, 99, 94, 89, 
+        static int years[] = {90, 91, 97, 98, 99, 94, 89,
                               96, 80, 92, 76, 88, 72, 84};
         int cal_year = years[selector];
 
@@ -4869,7 +4871,7 @@ for (; *ip && (op < oend); ) {
                         get_glyph_nc (ip, gbuf, '%');   /* get the literal name */
                         ap = _sim_get_env_special (gbuf, rbuf, sizeof (rbuf));
                         ip += strlen (gbuf);
-                        if (*ip == '%') 
+                        if (*ip == '%')
                             ++ip;
                         }
                     }
@@ -5024,8 +5026,8 @@ return 1;
    Syntax: IF {NOT} {<dev>} <reg>{<logical-op><value>}<conditional-op><value> commandtoprocess{; additionalcommandtoprocess}...
 
        If NOT is specified, the resulting expression value is inverted.
-       If <dev> is not specified, sim_dflt_dev (CPU) is assumed.  
-       <value> is expressed in the radix specified for <reg>.  
+       If <dev> is not specified, sim_dflt_dev (CPU) is assumed.
+       <value> is expressed in the radix specified for <reg>.
        <logical-op> and <conditional-op> are the same as that
        allowed for examine and deposit search specifications.
 
@@ -5034,7 +5036,7 @@ return 1;
 
        If -i is specified, the comparisons are done in a case insensitive manner.
        If NOT is specified, the resulting expression value is inverted.
-       "<string1>" and "<string2>" are quote delimited strings which include 
+       "<string1>" and "<string2>" are quote delimited strings which include
        expansion references to environment variables in the simulator.
        <compare-op> can be any one of:
             ==  - equal
@@ -5061,7 +5063,7 @@ if ((*optr != '"') && (*optr != '\'')) {
     ap = getenv (optr);
     if (!ap)
         return tptr;
-    /* for legacy ASSERT/IF behavior give precidence to REGister names over Environment Variables */
+    /* for legacy ASSERT/IF behavior give precedence to REGister names over Environment Variables */
     get_glyph (optr, optr, 0);
     rptr = find_reg (optr, &gptr, sim_dfdev);
     if (rptr)
@@ -5085,7 +5087,7 @@ t_bool result;
 t_addr addr = 0;
 t_stat reason;
 
-cptr = (CONST char *)get_sim_opt (CMD_OPT_SW|CMD_OPT_DFT, (CONST char *)cptr, &r);  
+cptr = (CONST char *)get_sim_opt (CMD_OPT_SW|CMD_OPT_DFT, (CONST char *)cptr, &r);
                                                         /* get sw, default */
 sim_stabr.boolop = sim_staba.boolop = -1;               /* no relational op dflt */
 if (*cptr == 0)                                         /* must be more */
@@ -5234,7 +5236,7 @@ else {
                 return SCPE_2MARG;
             }
         else {
-            if (!flag)                                      
+            if (!flag)
                 return SCPE_2FARG;                          /* IF needs actions! */
             }
         if (rptr) {                                         /* Handle register case */
@@ -5276,23 +5278,23 @@ return SCPE_OK;
 
    Syntax: SEND {After=m},{Delay=n},"string-to-send"
 
-   After  - is an integer (>= 0) representing a number of instruction 
-            delay before the initial characters is sent.  The after 
-            parameter can is set by itself (with SEND AFTER=n). 
-            The value specified then persists across SEND commands, 
-            and is the default value used in subsequent SEND commands 
+   After  - is an integer (>= 0) representing a number of instruction
+            delay before the initial characters is sent.  The after
+            parameter can is set by itself (with SEND AFTER=n).
+            The value specified then persists across SEND commands,
+            and is the default value used in subsequent SEND commands
             which don't specify an explicit AFTER parameter.  This default
             value is visible externally via an environment variable.
-   Delay  - is an integer (>= 0) representing a number of instruction 
+   Delay  - is an integer (>= 0) representing a number of instruction
             delay before and between characters being sent.  The
-            delay parameter can is set by itself (with SEND DELAY=n) 
+            delay parameter can is set by itself (with SEND DELAY=n)
             The value specified persists across SEND commands, and is
             the default value used in subsequent SEND commands which
             don't specify an explicit DELAY parameter.  This default
             value is visible externally via an environment variable.
    String - must be quoted.  Quotes may be either single or double but the
-            opening anc closing quote characters must match.  Within quotes 
-            C style character escapes are allowed.  
+            opening and closing quote characters must match.  Within quotes
+            C style character escapes are allowed.
             The following character escapes are explicitly supported:
         \r  Sends the ASCII Carriage Return character (Decimal value 13)
         \n  Sends the ASCII Linefeed character (Decimal value 10)
@@ -5307,7 +5309,7 @@ return SCPE_OK;
         \e  Sends the ASCII Escape character (Decimal value 27)
      as well as octal character values of the form:
         \n{n{n}} where each n is an octal digit (0-7)
-     and hext character values of the form:
+     and hex character values of the form:
         \xh{h} where each h is a hex digit (0-9A-Fa-f)
    */
 
@@ -5553,7 +5555,7 @@ long fpos;
 int32 saved_do_echo = sim_do_echo;
 int32 saved_goto_line = sim_goto_line[sim_do_depth];
 
-if ((NULL == sim_gotofile) || 
+if ((NULL == sim_gotofile) ||
     (0 == strcasecmp (sim_do_filename[sim_do_depth], "<stdin>")))
     return SCPE_UNK;                                    /* only valid inside of do_cmd */
 
@@ -5634,9 +5636,9 @@ const char *cptr;
 if (NULL == sim_gotofile) return SCPE_UNK;              /* only valid inside of do_cmd */
 cptr = get_glyph (fcptr, gbuf, 0);
 if ('\0' == gbuf[0]) return SCPE_ARG;                   /* unspecified goto target */
-snprintf (cbuf, sizeof (cbuf), "%s%s%s %s", (NULL != strchr (sim_do_filename[sim_do_depth], ' ')) ? "\"" : "", 
-                                            sim_do_filename[sim_do_depth], 
-                                            (NULL != strchr (sim_do_filename[sim_do_depth], ' ')) ? "\"" : "", 
+snprintf (cbuf, sizeof (cbuf), "%s%s%s %s", (NULL != strchr (sim_do_filename[sim_do_depth], ' ')) ? "\"" : "",
+                                            sim_do_filename[sim_do_depth],
+                                            (NULL != strchr (sim_do_filename[sim_do_depth], ' ')) ? "\"" : "",
                                             cptr);
 sim_switches |= SWMASK ('O');                           /* inherit ON state and actions */
 return do_cmd_label (flag, cbuf, gbuf);
@@ -5655,7 +5657,7 @@ if (0 == strcmp("ERROR", gbuf))
     cond = 0;
 else {
     if (SCPE_OK != sim_string_to_stat (gbuf, &cond)) {
-        if ((MATCH_CMD (gbuf, "CONTROL_C") == 0) || 
+        if ((MATCH_CMD (gbuf, "CONTROL_C") == 0) ||
             (MATCH_CMD (gbuf, "SIGINT") == 0))
             cond = ON_SIGINT_ACTION;                    /* Special case */
         else
@@ -5668,7 +5670,7 @@ if ((NULL == cptr) || ('\0' == *cptr)) {                /* Empty Action */
 else {
     if ((cptr > sim_sub_instr_buf) && ((size_t)(cptr - sim_sub_instr_buf) < sim_sub_instr_size))
         cptr = &sim_sub_instr[sim_sub_instr_off[cptr - sim_sub_instr_buf]]; /* get un-substituted string */
-    sim_on_actions[sim_do_depth][cond] = 
+    sim_on_actions[sim_do_depth][cond] =
         (char *)realloc(sim_on_actions[sim_do_depth][cond], 1+strlen(cptr));
     strcpy(sim_on_actions[sim_do_depth][cond], cptr);
     }
@@ -5706,13 +5708,13 @@ if ((flag) && (cptr) && (*cptr)) {                      /* Set ON with arg */
 if (cptr && (*cptr != 0))                               /* now eol? */
     return SCPE_2MARG;
 sim_on_check[sim_do_depth] = flag;
-if ((sim_do_depth != 0) && 
+if ((sim_do_depth != 0) &&
     (NULL == sim_on_actions[sim_do_depth][0])) {        /* default handler set? */
     sim_on_actions[sim_do_depth][0] =                   /* No, so make "RETURN" */
         (char *)malloc(1+strlen("RETURN"));             /* be the default action */
     strcpy(sim_on_actions[sim_do_depth][0], "RETURN");
     }
-if ((sim_do_depth != 0) && 
+if ((sim_do_depth != 0) &&
     (NULL == sim_on_actions[sim_do_depth][SCPE_AFAIL])) {/* handler set for AFAIL? */
     sim_on_actions[sim_do_depth][SCPE_AFAIL] =          /* No, so make "RETURN" */
         (char *)malloc(1+strlen("RETURN"));             /* be the action */
@@ -5880,12 +5882,12 @@ else {
 
         cptr = cbuf;
         get_glyph_quoted (cptr, cbuf, 0);
-        if (SCPE_OK != sim_decode_quoted_string (cbuf, (uint8 *)cbuf, &str_size)) 
+        if (SCPE_OK != sim_decode_quoted_string (cbuf, (uint8 *)cbuf, &str_size))
             return sim_messagef (SCPE_ARG, "Invalid quoted string: %s\n", cbuf);
         cbuf[str_size] = '\0';
         }
     else {
-        if (sim_switches & SWMASK ('A')) {              /* Arithmentic Expression Evaluation argument? */
+        if (sim_switches & SWMASK ('A')) {              /* Arithmetic Expression Evaluation argument? */
             t_svalue val;
             t_stat stat;
             const char *eptr = cptr;
@@ -5978,7 +5980,7 @@ else {
         }
     }
 if ((*cptr == 0) ||                                     /* must be more */
-    (*cptr == ';') || 
+    (*cptr == ';') ||
     (*cptr == '#'))
     return SCPE_2FARG;
 GET_SWITCHES (cptr);                                    /* get more switches */
@@ -6356,9 +6358,9 @@ size_t prefix_len = prefix ? strlen (prefix) : 0;
 size_t name_len = name ? strlen (name) : 0;
 size_t string_len = prefix_len + name_len;
 
-snprintf (nambuf, sizeof (nambuf), "%s%*s", prefix ? prefix : "", 
-                                            ((string_len <= 6) && (max_name_len <= 6)) ? -((int)(8 - prefix_len)) : 
-                                                                                        -((int)(max_name_len + 2)), 
+snprintf (nambuf, sizeof (nambuf), "%s%*s", prefix ? prefix : "",
+                                            ((string_len <= 6) && (max_name_len <= 6)) ? -((int)(8 - prefix_len)) :
+                                                                                        -((int)(max_name_len + 2)),
                                                                                         name ? name : "");
 return nambuf;
 }
@@ -6451,7 +6453,7 @@ else {
         fprintf (st, "%d units\n", ucnt + udbl);
         }
     else
-        if ((flag != 2) || !dptr->description || toks) 
+        if ((flag != 2) || !dptr->description || toks)
             fprintf (st, "\n");
     toks = 0;
     }
@@ -6481,7 +6483,7 @@ int32 toks = -1;
 
 if (flag > 1)
     fprintf (st, "%s", _sim_uname_prefix (uptr, "  "));
-else 
+else
     if (flag < 0)
         fprintf (st, "%s", _sim_uname (uptr));
     else
@@ -6502,7 +6504,7 @@ else {
         fprintf (st, "not attached");
         }
     }
-show_all_mods (st, dptr, uptr, MTAB_VUN, &toks);        /* show unit mods */ 
+show_all_mods (st, dptr, uptr, MTAB_VUN, &toks);        /* show unit mods */
 if (toks || (flag < 0) || (flag > 1))
     fprintf (st, "\n");
 return SCPE_OK;
@@ -6524,7 +6526,7 @@ if (dptr->flags & DEV_SECTORS)
     psize = psize * 512;
 if ((dptr->dwidth / dptr->aincr) > 8)
     width = "W";
-else 
+else
     width = "B";
 if ((psize < (kval * 10)) &&
     (0 != (psize % kval))) {
@@ -6761,7 +6763,7 @@ if (flag) {
         fprintf (st, "\n        Ethernet packet info: %s", eth_version());
 #if defined(__VMS)
     if (1) {
-        char *arch = 
+        char *arch =
 #if defined(__ia64)
             "I64";
 #elif defined(__ALPHA)
@@ -6831,7 +6833,7 @@ if (flag) {
         char tarversion[PATH_MAX+1] = "";
         char curlversion[PATH_MAX+1] = "";
         FILE *f;
-        
+
         if ((f = popen ("uname -a", "r"))) {
             memset (osversion, 0, sizeof (osversion));
             do {
@@ -6867,7 +6869,7 @@ if (flag) {
                 } while (proc_name[0] == '\0');
             pclose (f);
             if (proc_name[0] != '\0') {
-                
+
                 fprintf (st, "\n        Processor Name: %s", proc_name);
                 }
             }
@@ -7025,7 +7027,7 @@ else {
                                             (*tim) ? " (" : "", tim, (*tim) ? " total)" : "",
                                             (uptr->flags & UNIT_IDLE) ? " (Idle capable)" : "");
         else
-            fprintf (st, " at %d%s%s%s%s\n", _sim_activate_queue_time (uptr) - 1, 
+            fprintf (st, " at %d%s%s%s%s\n", _sim_activate_queue_time (uptr) - 1,
                                             (*tim) ? " (" : "", tim, (*tim) ? ")" : "",
                                             (uptr->flags & UNIT_IDLE) ? " (Idle capable)" : "");
         }
@@ -7072,7 +7074,7 @@ t_stat r;
 
 if (cptr && (*cptr != 0))
     r = ssh_break (st, cptr, 1);  /* more? */
-else 
+else
     r = sim_brk_showall (st, sim_switches);
 return r;
 }
@@ -7250,9 +7252,9 @@ t_stat r = SCPE_OK;
 if (dptr->modifiers == NULL)
     return SCPE_OK;
 for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) {
-    if (mptr->pstring && 
+    if (mptr->pstring &&
         ((mptr->mask & MTAB_XTD)?
-            (MODMASK(mptr,flag) && !MODMASK(mptr,MTAB_NMO)): 
+            (MODMASK(mptr,flag) && !MODMASK(mptr,MTAB_NMO)):
             ((MTAB_VUN == (uint32)flag) && ((uptr->flags & mptr->mask) == mptr->match)))) {
         if (*toks > 2) {
             fprintf (st, "\n");
@@ -7289,7 +7291,7 @@ DEVICE *dptr;
 
 if (cptr && (*cptr != 0))                               /* now eol? */
     return SCPE_2MARG;
-for (i = 0; (dptr = sim_devices[i]) != NULL; i++) 
+for (i = 0; (dptr = sim_devices[i]) != NULL; i++)
     show_dev_show_commands (st, dptr, NULL, flag, cptr);
 for (i = 0; sim_internal_device_count && (dptr = sim_internal_devices[i]); ++i)
     show_dev_show_commands (st, dptr, NULL, flag, cptr);
@@ -7302,7 +7304,7 @@ fprint_show_help (st, dptr);
 return SCPE_OK;
 }
 
-/* Show/change the current working directiory commands */
+/* Show/change the current working directory commands */
 
 t_stat show_default (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, CONST char *cptr)
 {
@@ -7346,7 +7348,7 @@ typedef struct {
     t_offset ByteCount;
     } DIR_CTX;
 
-static void sim_dir_entry (const char *directory, 
+static void sim_dir_entry (const char *directory,
                         const char *filename,
                         t_offset FileSize,
                         const struct stat *filestat,
@@ -7405,9 +7407,12 @@ t_stat dir_cmd (int32 flg, CONST char *cptr)
 {
 DIR_CTX dir_state;
 t_stat r;
-char WildName[PATH_MAX + 1];
+char *WildName;
 struct stat filestat;
 
+if ((WildName = (char *) calloc(PATH_MAX + 1, sizeof(char))) == NULL)
+  return SCPE_MEM;
+
 GET_SWITCHES (cptr);                                    /* get switches */
 memset (&dir_state, 0, sizeof (dir_state));
 strlcpy (WildName, cptr, sizeof(WildName));
@@ -7430,8 +7435,9 @@ if (r != SCPE_OK) {
     sim_printf ("\n Directory of %s\n\n", cp);
     sim_printf ("File Not Found\n\n");
     free (cp);
-    return SCPE_OK;
+    r = SCPE_OK;
     }
+free(WildName);
 return r;
 }
 
@@ -7442,7 +7448,7 @@ typedef struct {
     t_stat stat;
     } TYPE_CTX;
 
-static void sim_type_entry (const char *directory, 
+static void sim_type_entry (const char *directory,
                             const char *filename,
                             t_offset FileSize,
                             const struct stat *filestat,
@@ -7462,7 +7468,7 @@ sim_printf ("\n%s\n\n", FullPath);
 lbuf[sizeof(lbuf)-1] = '\0';
 if (sim_type_file_offset)
     (void)fseek (file, sim_type_file_offset, SEEK_SET);
-while ((NULL != fgets (lbuf, sizeof(lbuf)-1, file)) && 
+while ((NULL != fgets (lbuf, sizeof(lbuf)-1, file)) &&
        (lines++ < sim_type_line_count))
     sim_printf ("%s", lbuf);
 fclose (file);
@@ -7519,7 +7525,7 @@ if (file == NULL) {                         /* open failed? */
 lbuf[sizeof(lbuf)-1] = '\0';
 if (sim_type_file_offset)
     (void)fseek (file, sim_type_file_offset, SEEK_SET);
-while ((NULL != fgets (lbuf, sizeof(lbuf)-1, file)) && 
+while ((NULL != fgets (lbuf, sizeof(lbuf)-1, file)) &&
        (lines++ < sim_type_line_count))
     sim_printf ("%s", lbuf);
 fclose (file);
@@ -7530,7 +7536,7 @@ typedef struct {
     t_stat stat;
     } DEL_CTX;
 
-static void sim_delete_entry (const char *directory, 
+static void sim_delete_entry (const char *directory,
                               const char *filename,
                               t_offset FileSize,
                               const struct stat *filestat,
@@ -7567,7 +7573,7 @@ typedef struct {
     char destname[CBUFSIZE];
     } COPY_CTX;
 
-static void sim_copy_entry (const char *directory, 
+static void sim_copy_entry (const char *directory,
                             const char *filename,
                             t_offset FileSize,
                             const struct stat *filestat,
@@ -7648,7 +7654,7 @@ while ((c = strchr (path, '\\')))
     *c = '/';
 if (path[strlen (path) - 1] == '/')     /* trim any trailing / from the path */
     path[strlen (path) - 1] = '\0';
-while ((c = strstr (path, "//")))        
+while ((c = strstr (path, "//")))
     memmove (c, c + 1, strlen (c + 1) + 1); /* clean out any empty directories // */
 if ((!sim_stat (path, &filestat)) && (filestat.st_mode & S_IFDIR))
     return sim_messagef (SCPE_OK, "directory %s already exists\n", path);
@@ -8048,7 +8054,8 @@ t_stat reset_all_p (uint32 start)
 t_stat r;
 int32 old_sw = sim_switches;
 
-sim_switches = SWMASK ('P');
+/* Add power-up reset to the sim switches. */
+sim_switches = sim_switches | SWMASK ('P');
 r = reset_all (start);
 sim_switches = old_sw;
 return r;
@@ -8098,10 +8105,10 @@ for (mtab = dptr->modifiers; (mtab != NULL) && (mtab->mstring != NULL); ++mtab)
    du[mp] filename {arg}        dump to specified file
 */
 
-/* Memory File use (for internal memory static ROM images) 
+/* Memory File use (for internal memory static ROM images)
 
     when used to read ROM image with internally generated
-    load commands, calling code setups with sim_set_memory_file() 
+    load commands, calling code setups with sim_set_memory_file()
     sim_load uses Fgetc() instead of fgetc() or getc()
 */
 
@@ -8411,7 +8418,7 @@ if ((dptr = find_dev_from_unit (uptr)) == NULL)
     return SCPE_OK;
 if ((uptr->flags & UNIT_BUF) && (uptr->filebuf)) {
     uint32 cap = (uptr->hwmark + dptr->aincr - 1) / dptr->aincr;
-    if (((uptr->flags & UNIT_RO) == 0) && 
+    if (((uptr->flags & UNIT_RO) == 0) &&
         (memcmp (uptr->filebuf, uptr->filebuf2, (size_t)(SZ_D (dptr) * (uptr->capac / dptr->aincr))) != 0)) {
         sim_messagef (SCPE_OK, "%s: writing buffer to file: %s\n", sim_uname (uptr), uptr->filename);
         rewind (uptr->fileref);
@@ -8822,7 +8829,7 @@ if (v40) {
 #if defined(SIM_GIT_COMMIT_ID)
 #define S_xstr(a) S_str(a)
 #define S_str(a) #a
-    if ((memcmp (buf, "git commit id: " S_xstr(SIM_GIT_COMMIT_ID), 23)) && 
+    if ((memcmp (buf, "git commit id: " S_xstr(SIM_GIT_COMMIT_ID), 23)) &&
         (!sim_quiet) && (!suppress_warning)) {
         sim_printf ("warning - different simulator git versions.\nSaved commit id: %8.8s, Running commit id: %8.8s\n", buf + 15, S_xstr(SIM_GIT_COMMIT_ID));
         warned = TRUE;
@@ -8862,7 +8869,7 @@ for ( ;; ) {                                            /* device loop */
     if (buf[0] != '\0')
         sim_debug (SIM_DBG_RESTORE, &sim_scp_dev, "logical name=%s\n", buf);
     deassign_device (dptr);                             /* delete old name */
-    if ((buf[0] != 0) && 
+    if ((buf[0] != 0) &&
         ((r = assign_device (dptr, buf)) != SCPE_OK)) {
         r = SCPE_INCOMP;
         goto Cleanup_Return;
@@ -8987,7 +8994,7 @@ for ( ;; ) {                                            /* device loop */
                 for (j = 0; j < limit; j++, k = k + (dptr->aincr)) {
                     if (blkcnt < 0)                     /* compressed? */
                         val = 0;
-                    else 
+                    else
                         SZ_LOAD (sz, val, mbuf, j);     /* saved value */
                     r = dptr->deposit (val, k, uptr, SIM_SW_REST);
                     if (r != SCPE_OK) {
@@ -9032,8 +9039,8 @@ for ( ;; ) {                                            /* device loop */
             }
         }                                               /* end register loop */
     }                                                   /* end device loop */
-/* Now that all of the register state has been imported, we can attach 
-   units which were originally attached.  Some of these attach operations 
+/* Now that all of the register state has been imported, we can attach
+   units which were originally attached.  Some of these attach operations
    may depend on the state of the device (in registers) to work correctly */
 for (j=0, r = SCPE_OK; j<attcnt; j++) {
     if ((r == SCPE_OK) && (!dont_detach_attach)) {
@@ -9042,7 +9049,7 @@ for (j=0, r = SCPE_OK; j<attcnt; j++) {
 
         sim_debug (SIM_DBG_RESTORE, &sim_scp_dev, "ATTACHING=%s to %s\n", sim_uname (attunits[j]), attnames[j]);
         dptr = find_dev_from_unit (attunits[j]);
-        if ((!force_restore) && 
+        if ((!force_restore) &&
             (!stat(attnames[j], &fstat)))
             if (fstat.st_mtime > rstat.st_mtime + 30) {
                 r = SCPE_INCOMP;
@@ -9059,7 +9066,7 @@ for (j=0, r = SCPE_OK; j<attcnt; j++) {
         }
     else {
         if ((r == SCPE_OK) && (dont_detach_attach)) {
-            if ((!suppress_warning) && 
+            if ((!suppress_warning) &&
                 ((!attunits[j]->filename) || (strcmp (attunits[j]->filename, attnames[j]) != 0))) {
                 warned = TRUE;
                 sim_printf ("warning - %s was attached to '%s'", sim_uname (attunits[j]), attnames[j]);
@@ -9132,14 +9139,14 @@ return SCPE_OK;
    go [new PC]          start simulation
    co[nt]               start simulation
    s[tep] [step limit]  start simulation for 'limit' instructions
-   next                 start simulation for 1 instruction 
+   next                 start simulation for 1 instruction
                         stepping over subroutine calls
    b[oot] device        bootstrap from device and start simulation
 
    switches:
     -Q                  quiet return status
-    -T                  (only for step), causes the step limit to 
-                        be a number of microseconds to run for            
+    -T                  (only for step), causes the step limit to
+                        be a number of microseconds to run for
 */
 
 t_stat run_cmd (int32 flag, CONST char *cptr)
@@ -9192,7 +9199,7 @@ if ((flag == RU_RUN) || (flag == RU_GO)) {              /* run or go */
         if (MATCH_CMD (gbuf, "UNTIL") != 0)
             cptr = get_glyph (cptr, gbuf, 0);           /* get next glyph */
         if (MATCH_CMD (gbuf, "UNTIL") != 0)
-            return sim_messagef (SCPE_2MARG, "Unexpected %s command argument: %s %s\n", 
+            return sim_messagef (SCPE_2MARG, "Unexpected %s command argument: %s %s\n",
                                              (flag == RU_RUN) ? "RUN" : "GO", gbuf, cptr);
         sim_switches = 0;
         GET_SWITCHES (cptr);
@@ -9282,7 +9289,7 @@ else if (flag == RU_BOOT) {                             /* boot */
         return r;
     }
 
-else 
+else
     if (flag != RU_CONT)                                /* must be cont */
         return SCPE_IERR;
     else                                                /* CONTINUE command */
@@ -9453,7 +9460,7 @@ if ((r == SCPE_OK) && (flag == RU_RUN)) {
 return r;
 }
 
-/* Print stopped message 
+/* Print stopped message
  * For VM stops, if a VM-specific "sim_vm_fprint_stopped" pointer is defined,
  * call the indicated routine to print additional information after the message
  * and before the PC value is printed.  If the routine returns FALSE, skip
@@ -9666,7 +9673,7 @@ for (gptr = gbuf, reason = SCPE_OK;
         strlcpy (gbuf, ap, sizeof (gbuf));
         gptr = gbuf;
         }
-    /* Special handling of EXAMINE to cover the case of ALL (detected in 
+    /* Special handling of EXAMINE to cover the case of ALL (detected in
        get_range) so that all of memory isn't output at once without any
        ability to interrupt that output */
     tptr = get_range (sim_dfdev, gptr, &low, &high, sim_dfdev->aradix,
@@ -9993,7 +10000,7 @@ t_value mask;
 void    *ptr;
 t_value prev_val = 0;
 
-if ((!(sim_switches & SWMASK ('Z'))) && 
+if ((!(sim_switches & SWMASK ('Z'))) &&
     (rptr->flags & REG_DEPOSIT) && sim_vm_reg_update)
     prev_val = get_rval (rptr, idx);
 
@@ -10020,7 +10027,7 @@ else
         *((uint16 *) ptr) =
           (uint16) ((*((uint16 *) ptr) & mask) | val);
 
-    else 
+    else
         if (rptr->size == sizeof (uint32))
             *((uint32 *) ptr) =
               (uint32) ((*((uint32 *) ptr) & mask) | val);
@@ -10029,7 +10036,7 @@ else
             *((t_value *) ptr) =                        /*   then access using the largest size permitted */
               (*((t_value *) ptr) & mask) | val;
 
-if ((!(sim_switches & SWMASK ('Z'))) && 
+if ((!(sim_switches & SWMASK ('Z'))) &&
     (rptr->flags & REG_DEPOSIT) && sim_vm_reg_update)
     sim_vm_reg_update (rptr, idx, prev_val, val);
 }
@@ -10186,7 +10193,7 @@ if (flag & EX_I) {
     }
 if (uptr->flags & UNIT_RO)                              /* read only? */
     return sim_messagef (SCPE_RO, "%s is read only.\n"
-                                  "%sse a writable device to change %s\n", 
+                                  "%sse a writable device to change %s\n",
                                   sim_uname (uptr), (uptr->flags & UNIT_ROABLE) ? "Attach Read/Write or u" : "U",
                                   uptr->filename ? uptr->filename : "it");
 mask = width_mask[dptr->dwidth];
@@ -10515,7 +10522,7 @@ return val;
         cptr    =       pointer to input string
         *lo     =       pointer to low result
         *hi     =       pointer to high result
-        aradix  =       radix
+        rdx     =       radix
         max     =       default high value
         term    =       terminating character, 0 if none
    Outputs:
@@ -10535,9 +10542,9 @@ if (max && strncmp (cptr, "ALL", strlen ("ALL")) == 0) {    /* ALL? */
     }
 else {
     if ((strncmp (cptr, ".", strlen (".")) == 0) &&             /* .? */
-        ((cptr[1] == '\0') || 
-         (cptr[1] == '-')  || 
-         (cptr[1] == ':')  || 
+        ((cptr[1] == '\0') ||
+         (cptr[1] == '-')  ||
+         (cptr[1] == ':')  ||
          (cptr[1] == '/'))) {
         tptr = cptr + strlen (".");
         *lo = *hi = sim_last_addr;
@@ -10586,17 +10593,17 @@ return tptr;
    Inputs:
         iptr        =   pointer to input string
         optr        =   pointer to output buffer
-                        the output buffer must be allocated by the caller 
-                        and to avoid overrunat it must be at least as big 
+                        the output buffer must be allocated by the caller
+                        and to avoid overrun it must be at least as big
                         as the input string.
 
    Outputs
         result      =   status of decode SCPE_OK when good, SCPE_ARG otherwise
         osize       =   size of the data in the optr buffer
 
-   The input string must be quoted.  Quotes may be either single or 
-   double but the opening anc closing quote characters must match.  
-   Within quotes C style character escapes are allowed.  
+   The input string must be quoted.  Quotes may be either single or
+   double but the opening and closing quote characters must match.
+   Within quotes C style character escapes are allowed.
 
    The following character escapes are explicitly supported:
         \r  ASCII Carriage Return character (Decimal value 13)
@@ -10612,9 +10619,9 @@ return tptr;
         \e  ASCII Escape character (Decimal value 27)
      as well as octal character values of the form:
         \n{n{n}} where each n is an octal digit (0-7)
-     and hext character values of the form:
+     and hex character values of the form:
         \xh{h} where each h is a hex digit (0-9A-Fa-f)
-        
+
 */
 
 t_stat sim_decode_quoted_string (const char *iptr, uint8 *optr, uint32 *osize)
@@ -10623,7 +10630,7 @@ char quote_char;
 uint8 *ostart = optr;
 
 *osize = 0;
-if ((strlen(iptr) == 1) || 
+if ((strlen(iptr) == 1) ||
     (iptr[0] != iptr[strlen(iptr)-1]) ||
     ((iptr[strlen(iptr)-1] != '"') && (iptr[strlen(iptr)-1] != '\'')))
     return SCPE_ARG;            /* String must be quote delimited */
@@ -10735,9 +10742,9 @@ return SCPE_OK;
         \e  ASCII Escape character (Decimal value 27)
      as well as octal character values of the form:
         \n{n{n}} where each n is an octal digit (0-7)
-     and hext character values of the form:
+     and hex character values of the form:
         \xh{h} where each h is a hex digit (0-9A-Fa-f)
-        
+
 */
 
 char *sim_encode_quoted_string (const uint8 *iptr, size_t size)
@@ -10766,7 +10773,7 @@ if (double_quote_found && (!single_quote_found))
 *tptr++ = quote;
 while (size--) {
     switch (*iptr) {
-        case '\r': 
+        case '\r':
             *tptr++ = '\\'; *tptr++ = 'r'; break;
         case '\n':
             *tptr++ = '\\'; *tptr++ = 'n'; break;
@@ -11066,7 +11073,7 @@ return NULL;
         cptr    =       pointer to input string
    Outputs:
         *sw      =       switch bit mask
-        *mumber  =       numeric value
+        *number  =       numeric value
    Return value:        SW_ERROR     if error
                         SW_BITMASK   if switch bitmask or not a switch
                         SW_NUMBER    if numeric
@@ -11132,7 +11139,7 @@ return cptr;
         opt     =       command options
         cptr    =       pointer to input string
    Outputs:
-        ptr     =       pointer to next glypsh, NULL if error
+        ptr     =       pointer to next glyphs, NULL if error
         *stat   =       error status
 */
 
@@ -11145,7 +11152,7 @@ DEVICE *tdptr;
 UNIT *tuptr;
 
 sim_switches = 0;                                       /* no switches */
-sim_switch_number = 0;                                  /* no numberuc switch */
+sim_switch_number = 0;                                  /* no number switch */
 sim_ofile = NULL;                                       /* no output file */
 sim_schrptr = NULL;                                     /* no search */
 sim_schaptr = NULL;                                     /* no search */
@@ -11528,21 +11535,21 @@ return ret;
 
    On an error, the endptr will equal the inptr.
 
-   If the value of radix is zero, the syntax expected is similar 
+   If the value of radix is zero, the syntax expected is similar
    to that of integer constants, which is formed by a succession of:
 
       - An optional sign character (+ or -)
-      - An optional prefix indicating octal or hexadecimal radix 
+      - An optional prefix indicating octal or hexadecimal radix
         ("0" or "0x"/"0X" respectively)
-      - A sequence of decimal digits (if no radix prefix was specified) 
-        or one of binary, octal or hexadecimal digits if a specific 
+      - A sequence of decimal digits (if no radix prefix was specified)
+        or one of binary, octal or hexadecimal digits if a specific
         prefix is present
 
-   If the radix value is between 2 and 36, the format expected for 
-   the integral number is a succession of any of the valid digits 
-   and/or letters needed to represent integers of the specified 
-   radix (starting from '0' and up to 'z'/'Z' for radix 36). The 
-   sequence may optionally be preceded by a sign (either + or -) and, 
+   If the radix value is between 2 and 36, the format expected for
+   the integral number is a succession of any of the valid digits
+   and/or letters needed to represent integers of the specified
+   radix (starting from '0' and up to 'z'/'Z' for radix 36). The
+   sequence may optionally be preceded by a sign (either + or -) and,
    if base is 16, an optional "0x" or "0X" prefix.  If the base is 2,
    an optional "0b" or "0B" prefix.
 
@@ -11560,12 +11567,12 @@ if (((radix < 2) || (radix > 36)) && (radix != 0))
     return 0;
 while (sim_isspace (*inptr))                            /* bypass white space */
     inptr++;
-if (((radix == 0) || (radix == 16)) && 
+if (((radix == 0) || (radix == 16)) &&
     ((!memcmp("0x", inptr, 2)) || (!memcmp("0X", inptr, 2)))) {
     radix = 16;
     inptr += 2;
     }
-if (((radix == 0) || (radix == 2)) && 
+if (((radix == 0) || (radix == 2)) &&
     ((!memcmp("0b", inptr, 2)) || (!memcmp("0B", inptr, 2)))) {
     radix = 2;
     inptr += 2;
@@ -11583,7 +11590,7 @@ for (c = *inptr; sim_isalnum(c); c = *++inptr) {        /* loop through char */
     else {
         if (radix <= 10)                                /* stop if not expected */
             break;
-        else 
+        else
             digit = c + 10 - (uint32) 'A';              /* convert letter */
         }
     if (digit >= radix)                                 /* valid in radix? */
@@ -11617,12 +11624,12 @@ if ((*inptr == '-') ||
         negate = -1;
     ++inptr;
     }
-if (((radix == 0) || (radix == 16)) && 
+if (((radix == 0) || (radix == 16)) &&
     ((!memcmp("0x", inptr, 2)) || (!memcmp("0X", inptr, 2)))) {
     radix = 16;
     inptr += 2;
     }
-if (((radix == 0) || (radix == 2)) && 
+if (((radix == 0) || (radix == 2)) &&
     ((!memcmp("0b", inptr, 2)) || (!memcmp("0B", inptr, 2)))) {
     radix = 2;
     inptr += 2;
@@ -11687,7 +11694,7 @@ dbuf[MAX_WIDTH] = 0;
 d = MAX_WIDTH;
 do {
     d = d - 1;
-    digit = (int32) (val % radix);
+    digit = val % radix;
     val = val / radix;
     dbuf[d] = (char)((digit <= 9)? '0' + digit: 'A' + (digit - 10));
     } while ((d > 0) && (val != 0));
@@ -11705,7 +11712,7 @@ switch (format) {
                 break;
         ndigits = MAX_WIDTH - digit;
         commas = (ndigits - 1)/3;
-        for (digit=0; digit<ndigits-3; digit++)
+        for (digit=0; digit + 3 < ndigits; digit++)
             dbuf[MAX_WIDTH + (digit - ndigits) - (ndigits - digit - 1)/3] = dbuf[MAX_WIDTH + (digit - ndigits)];
         for (digit=1; digit<=commas; digit++)
             dbuf[MAX_WIDTH - (digit * 4)] = ',';
@@ -11860,8 +11867,8 @@ char *p;
 sprintf (tmpbuf, "%.0f", number);
 len = strlen (tmpbuf);
 for (c=0, p=buf; c < len; c++) {
-    if ((c > 0) && 
-        (sim_isdigit (tmpbuf[c])) && 
+    if ((c > 0) &&
+        (sim_isdigit (tmpbuf[c])) &&
         (0 == ((len - c) % 3)))
         *(p++) = ',';
     *(p++) = tmpbuf[c];
@@ -11936,10 +11943,10 @@ if (sim_interval < 0) {
     sim_interval_catchup = sim_interval;
     sim_interval = 0;
     UPDATE_SIM_TIME;                          /* update sim time */
-    sim_debug (SIM_DBG_EVENT_NEG, &sim_scp_dev, "Processing event for %s with sim_interval = %d, event time = %.0f\n", 
+    sim_debug (SIM_DBG_EVENT_NEG, &sim_scp_dev, "Processing event for %s with sim_interval = %d, event time = %.0f\n",
         sim_uname (sim_clock_queue), sim_interval_catchup, sim_gtime ());
     if (sim_clock_queue->next != QUEUE_LIST_END)
-        sim_debug (SIM_DBG_EVENT_NEG, &sim_scp_dev, "- Next event for %s after = %d\n", 
+        sim_debug (SIM_DBG_EVENT_NEG, &sim_scp_dev, "- Next event for %s after = %d\n",
             sim_uname (sim_clock_queue->next), sim_clock_queue->next->time);
     sim_time -= sim_clock_queue->time;
     sim_rtime -= sim_clock_queue->time;
@@ -11983,18 +11990,18 @@ do {
         (bare_reason >= SCPE_BASE)    &&
         (bare_reason != SCPE_EXPECT)  &&
         (bare_reason != SCPE_REMOTE)  &&
-        (bare_reason != SCPE_MTRLNT)  && 
-        (bare_reason != SCPE_STOP)    && 
-        (bare_reason != SCPE_STEP)    && 
-        (bare_reason != SCPE_RUNTIME) && 
+        (bare_reason != SCPE_MTRLNT)  &&
+        (bare_reason != SCPE_STOP)    &&
+        (bare_reason != SCPE_STEP)    &&
+        (bare_reason != SCPE_RUNTIME) &&
         (bare_reason != SCPE_EXIT)) {
-        if (bare_reason == SCPE_UNATT) 
+        if (bare_reason == SCPE_UNATT)
             sim_messagef (reason, "\nUnexpected I/O error while processing event for %s - %s\n", sim_uname (uptr), sim_error_text (reason));
         else
             sim_messagef (reason, "\nUnexpected internal error while processing event for %s which returned %d - %s\n", sim_uname (uptr), reason, sim_error_text (reason));
         }
-    } while ((reason == SCPE_OK) && 
-             ((sim_interval + sim_interval_catchup) <= 0) && 
+    } while ((reason == SCPE_OK) &&
+             ((sim_interval + sim_interval_catchup) <= 0) &&
              (sim_clock_queue != QUEUE_LIST_END) &&
              (!stop_cpu));
 
@@ -12342,7 +12349,7 @@ return cnt;
         addr                    address of the breakpoint
         type                    types of breakpoints set on the address
                                 a bit mask representing letters A-Z
-        cnt                     number of iterations before breakp is taken
+        cnt                     number of iterations before breakpoint is taken
         action                  pointer command string to be executed
                                 when break is taken
         next                    list of other breakpoints with the same addr specifier
@@ -12403,7 +12410,7 @@ int32 lo, hi, p;
 BRKTAB *bp;
 
 if (sim_brk_ent == 0) {                                 /* table empty? */
-    sim_brk_ins = 0;                                    /* insrt at head */
+    sim_brk_ins = 0;                                    /* insert at head */
     return NULL;                                        /* sch fails */
     }
 lo = 0;                                                 /* initial bounds */
@@ -12421,7 +12428,7 @@ do {
         else
             lo = p + 1;                                 /* go up? p is lower */
     } while (lo <= hi);
-if (loc < bp->addr)                                     /* insrt before or */
+if (loc < bp->addr)                                     /* insert before or */
     sim_brk_ins = p;
 else
     sim_brk_ins = p + 1;                                /* after last sch */
@@ -12433,7 +12440,7 @@ BRKTAB *sim_brk_fnd_ex (t_addr loc, uint32 btyp, t_bool any_typ, uint32 spc)
 BRKTAB *bp = sim_brk_fnd (loc);
 
 while (bp) {
-    if (any_typ ? ((bp->typ & btyp) && (bp->time_fired[spc] != sim_gtime())) : 
+    if (any_typ ? ((bp->typ & btyp) && (bp->time_fired[spc] != sim_gtime())) :
                   (bp->typ == btyp))
         return bp;
     bp = bp->next;
@@ -12580,7 +12587,7 @@ if (sw == 0)
 for (i = 0; i < sim_brk_ent;) {
     t_addr loc = sim_brk_tab[i]->addr;
     sim_brk_clr (loc, sw);
-    if ((i < sim_brk_ent) && 
+    if ((i < sim_brk_ent) &&
         (loc == sim_brk_tab[i]->addr))
         ++i;
     }
@@ -12749,7 +12756,7 @@ if ((ep != NULL) && (*ep != ';')) {                     /* if a quoted string is
         if (ep [0] == '\\' && ep [1] == quote)          /*   if an escaped quote sequence follows */
             ep = ep + 2;                                /*     then skip over the pair */
         else                                            /*   otherwise */
-            ep = ep + 1;                                /*     skip the non-quote character */  
+            ep = ep + 1;                                /*     skip the non-quote character */
     ep = strchr (ep, ';');                              /* the next semicolon is outside the quotes if it exists */
     }
 if (ep != NULL) {                                       /* if a semicolon is present */
@@ -12858,7 +12865,7 @@ char buf[32];
 msg[0] = '\0';
 if (sim_vm_sprint_addr)
     sim_vm_sprint_addr (addr, sim_dflt_dev, (t_value)sim_brk_match_addr);
-else 
+else
     sprint_val (addr, (t_value)sim_brk_match_addr, sim_dflt_dev->aradix, sim_dflt_dev->awidth, PV_LEFT);
 if (sim_brk_type_desc) {
     BRKTYPTAB *brk = sim_brk_type_desc;
@@ -12879,7 +12886,7 @@ return msg;
 
 /* Expect package.  This code provides a mechanism to stop and control simulator
    execution based on traffic coming out of simulated ports and as well as a means
-   to inject data into those ports.  It can conceptually viewed as a string 
+   to inject data into those ports.  It can conceptually viewed as a string
    breakpoint package.
 
    Expect rules are stored in tables associated with each port which can use this
@@ -12901,7 +12908,7 @@ return msg;
 
    The package contains the following public routines:
 
-        sim_set_expect          expect command parser and intializer
+        sim_set_expect          expect command parser and initializer
         sim_set_noexpect        noexpect command parser
         sim_exp_init            initialize an expect context
         sim_exp_set             set or add an expect rule
@@ -12958,7 +12965,7 @@ if ((*cptr != '\0') && (*cptr != '"') && (*cptr != '\''))
     return sim_messagef (SCPE_ARG, "String must be quote delimited\n");
 cptr = get_glyph_quoted (cptr, gbuf, 0);
 
-/* Hsndle a bare HALTAFTER=nnn command */
+/* Handle a bare HALTAFTER=nnn command */
 if ((gbuf[0] == '\0') && (*cptr == '\0') && after_set) {
     set_default_env_parameter (dev_name, "SIM_EXPECT_HALTAFTER", after);
     return SCPE_OK;
@@ -13097,7 +13104,7 @@ if (switches & EXP_TYP_REGEX) {
 else {
     if (switches & EXP_TYP_REGEX_I) {
         free (match_buf);
-        return sim_messagef (SCPE_ARG, "Case independed matching is only valid for RegEx expect rules\n");
+        return sim_messagef (SCPE_ARG, "Case independent matching is only valid for RegEx expect rules\n");
         }
     sim_data_trace(exp->dptr, exp->dptr->units, (const uint8 *)match, "", strlen(match)+1, "Expect Match String", exp->dbit);
     if (SCPE_OK != sim_decode_quoted_string (match, match_buf, &match_size)) {
@@ -13258,7 +13265,7 @@ EXPTAB *ep = NULL;
 int regex_checks = 0;
 char *tstr = NULL;
 
-if ((!exp) || (!exp->rules))                            /* Anying to check? */
+if ((!exp) || (!exp->rules))                            /* Anything to check? */
     return SCPE_OK;
 
 exp->buf[exp->buf_ins++] = data;                        /* Save new data */
@@ -13323,7 +13330,7 @@ for (i=0; i < exp->size; i++) {
                     sim_debug (exp->dbit, exp->dptr, "unsetenv %s\n", env_name);
                     unsetenv(env_name);
                     }
-                } 
+                }
             for (; j<sim_exp_match_sub_count; j++) {
                 char env_name[32];
 
@@ -13342,9 +13349,9 @@ for (i=0; i < exp->size; i++) {
     else {
         if (exp->buf_data < ep->size)                           /* Too little data to match yet? */
             continue;                                           /* Yes, Try next one. */
-        if (exp->buf_ins < ep->size) {                          /* Match might stradle end of buffer */
-            /* 
-             * First compare the newly deposited data at the beginning 
+        if (exp->buf_ins < ep->size) {                          /* Match might straddle end of buffer */
+            /*
+             * First compare the newly deposited data at the beginning
              * of buffer with the end of the match string
              */
             if (exp->buf_ins > 0) {
@@ -13393,10 +13400,10 @@ for (i=0; i < exp->size; i++) {
     }
 if (exp->buf_ins == exp->buf_size) {                    /* At end of match buffer? */
     if (regex_checks) {
-        /* When processing regular expressions, let the match buffer fill 
+        /* When processing regular expressions, let the match buffer fill
            up and then shuffle the buffer contents down by half the buffer size
-           so that the regular expression has a single contiguous buffer to 
-           match against instead of the wrapping buffer paradigm which is 
+           so that the regular expression has a single contiguous buffer to
+           match against instead of the wrapping buffer paradigm which is
            used when no regular expression rules are in effect */
         memmove (exp->buf, &exp->buf[exp->buf_size/2], exp->buf_size-(exp->buf_size/2));
         exp->buf_ins -= exp->buf_size/2;
@@ -13414,7 +13421,7 @@ if (i != exp->size) {                                   /* Found? */
     setenv ("_EXPECT_MATCH_PATTERN", ep->match_pattern, 1);   /* Make the match detail available as an environment variable */
     if (ep->cnt > 0) {
         ep->cnt -= 1;
-        sim_debug (exp->dbit, exp->dptr, "Waiting for %d more match%s before stopping\n", 
+        sim_debug (exp->dbit, exp->dptr, "Waiting for %d more match%s before stopping\n",
                                          ep->cnt, (ep->cnt == 1) ? "" : "es");
         }
     else {
@@ -13436,7 +13443,7 @@ if (i != exp->size) {                                   /* Found? */
             }
         sim_activate (&sim_expect_unit,                 /* schedule simulation stop when indicated */
                       (switches & EXP_TYP_TIME) ?
-                            (int32)((sim_timer_inst_per_sec ()*after)/1000000.0) : 
+                            (int32)((sim_timer_inst_per_sec ()*after)/1000000.0) :
                             after);
         }
     /* Matched data is no longer available for future matching */
@@ -13465,10 +13472,10 @@ snd->insoff += size;
 snd->delay = (sim_switches & SWMASK ('T')) ? (uint32)((sim_timer_inst_per_sec()*delay)/1000000.0) : delay;
 snd->after = (sim_switches & SWMASK ('T')) ? (uint32)((sim_timer_inst_per_sec()*after)/1000000.0) : after;
 if (sim_switches & SWMASK ('T'))
-    sim_debug (snd->dbit, snd->dptr, "%d bytes queued for input. Delay %d usecs = %d insts, After %d usecs = %d insts\n", 
+    sim_debug (snd->dbit, snd->dptr, "%d bytes queued for input. Delay %d usecs = %d insts, After %d usecs = %d insts\n",
                                      (int)size, (int)delay, (int)snd->delay, (int)after, (int)snd->after);
 else
-    sim_debug (snd->dbit, snd->dptr, "%d bytes queued for input. Delay=%d, After=%d\n", 
+    sim_debug (snd->dbit, snd->dptr, "%d bytes queued for input. Delay=%d, After=%d\n",
                                      (int)size, (int)delay, (int)after);
 snd->next_time = sim_gtime() + snd->after;
 return SCPE_OK;
@@ -13582,7 +13589,7 @@ if (cond == (1+SCPE_MAX_ERR-SCPE_BASE)) {       /* not found? */
 *stat = cond;
 if (cond > SCPE_MAX_ERR)
     return SCPE_ARG;
-return SCPE_OK;    
+return SCPE_OK;
 }
 
 /* Debug printout routines, from Dave Hittner */
@@ -13708,8 +13715,8 @@ while (NULL != (eol = strchr (debug_line_buf, '\n')) || flush) {
             /* Ensure SIMH only executes memcmp() if the last message's comparison length
                is the same as the current debug line's comparison length. */
             if (debug_line_buf_last_len == compare_len &&
-                0 == memcmp (&debug_line_buf[endprefix - debug_line_buf], 
-                              &debug_line_buf_last[debug_line_buf_last_endprefix_offset], 
+                0 == memcmp (&debug_line_buf[endprefix - debug_line_buf],
+                              &debug_line_buf_last[debug_line_buf_last_endprefix_offset],
                              compare_len)) {
                 ++debug_line_count;
                 memcpy (debug_line_last_prefix, debug_line_buf, (endprefix - debug_line_buf) + 3);
@@ -13830,8 +13837,8 @@ if (sim_deb_switches & (SWMASK ('T') | SWMASK ('R') | SWMASK ('A'))) {
     }
 if (sim_deb_switches & SWMASK ('P')) {
     t_value val;
-    
-    /* Some simulators expose the PC as a register, some don't expose it or expose a register 
+
+    /* Some simulators expose the PC as a register, some don't expose it or expose a register
        which is not a variable which is updated during instruction execution (i.e. only upon
        exit of sim_instr()).  For the -P debug option to be effective, such a simulator should
        provide a routine which returns the value of the current PC and set the sim_vm_pc_value
@@ -13895,7 +13902,7 @@ for (i = fields-1; i >= 0; i--) {                   /* print xlation, transition
    indicating the state and transition of the bit and bitfields. States:
    0=steady(0->0), 1=steady(1->1), _=falling(1->0), ^=rising(0->1) */
 
-void sim_debug_bits_hdr(uint32 dbits, DEVICE* dptr, const char *header, 
+void sim_debug_bits_hdr(uint32 dbits, DEVICE* dptr, const char *header,
     BITFIELD* bitdefs, uint32 before, uint32 after, int terminate)
 {
 if (sim_deb && dptr && (dptr->dctrl & dbits)) {
@@ -14083,9 +14090,9 @@ return stat | ((stat != SCPE_OK) ? SCPE_NOMESSAGE : 0);
    set and the bitmask matches the current device debug options.
    Extra returns are added for un*x systems, since the output
    device is set into 'raw' mode when the cpu is booted,
-   and the extra returns don't hurt any other systems. 
+   and the extra returns don't hurt any other systems.
    Callers should be calling sim_debug() which is a macro
-   defined in scp.h which evaluates the action condition before 
+   defined in scp.h which evaluates the action condition before
    incurring call overhead. */
 void _sim_vdebug (uint32 dbits, DEVICE* dptr, UNIT *uptr, const char* fmt, va_list arglist)
 {
@@ -14318,8 +14325,8 @@ if (sim_mfile || (sim_deb && (f == sim_deb))) {
 #endif                                                  /* NO_vsnprintf */
         va_end (arglist);
 
-        /* If the formatted result didn't fit into the buffer, 
-         * then grow the buffer and try again 
+        /* If the formatted result didn't fit into the buffer,
+         * then grow the buffer and try again
          */
 
         if ((len < 0) || (len >= bufsize-1)) {
@@ -14337,7 +14344,7 @@ if (sim_mfile || (sim_deb && (f == sim_deb))) {
         break;
         }
 
-    /* Store the formatted data with priority to a 
+    /* Store the formatted data with priority to a
        memory file vs debug de-duplication*/
 
     if (sim_mfile) {
@@ -14446,7 +14453,7 @@ static void appendText (TOPIC *topic, const char *text, size_t len)
 {
 char *newt;
 
-if (!len) 
+if (!len)
     return;
 
 newt = (char *)realloc (topic->text, topic->len + len +1);
@@ -14593,7 +14600,7 @@ for (hblock = astrings; (htext = *hblock) != NULL; hblock++) {
                                                 appendText (topic, "    ", 4);
                                             }
                                         start = ep;
-                                        } 
+                                        }
                                     else
                                         ep++;
                                     }
@@ -14629,7 +14636,7 @@ for (hblock = astrings; (htext = *hblock) != NULL; hblock++) {
             if (n <= topic->level) {            /* Find level for new topic */
                 while (n <= topic->level)
                     topic = topic->parent;
-                } 
+                }
             else {
                 if (n > topic->level + 1) {     /* Skipping down more than 1 */
                     FAIL (SCPE_ARG, Level not contiguous, htext); /* E.g. 1 3, not reasonable */
@@ -14736,7 +14743,7 @@ if (topic->level == 0) {
         FAIL (SCPE_MEM, No memory, NULL);
         }
     prefix[0] = '\n';
-    } 
+    }
 else
     prefix = helpPrompt (topic->parent, "", oneword);
 
@@ -14795,7 +14802,7 @@ if (!tmp) {
     fprintf (st, "Unable to create temporary file: %s\n", strerror (errno));
     return;
     }
-    
+
 if (topic->title) {
     fprintf (st, "%s\n", topic->title+1);
 
@@ -14850,7 +14857,7 @@ if (topic->flags & HLP_MAGIC_TOPIC) {
     }
 else
     fprintf (st, "\n%s %s\n", topic->label, topic->title);
-    
+
 /* Topic text (for magic topics, follows for explanations)
  * It's possible/reasonable for a magic topic to have no text.
  */
@@ -14884,7 +14891,7 @@ for (i = 0; i < topic->kids; i++) {
     while (*cptr) {
         if (blankch (*cptr)) {
             *cptr++ = '_';
-            } 
+            }
         else {
             *cptr = (char)sim_toupper (*cptr);
             cptr++;
@@ -14938,11 +14945,11 @@ if ((failed = setjmp (help_env)) != 0) {
     fprintf (stderr, "\nHelp was unable to process the help for this device.\n"
                      "Error in block %u line %u: %s\n"
                      "%s%*.*s%s"
-                     " Please contact the device maintainer.\n", 
-             (int)help_where.block, (int)help_where.line, help_where.error, 
-             help_where.prox ? "Near '" : "", 
-             help_where.prox ? 15 : 0, help_where.prox ? 15 : 0, 
-             help_where.prox ? help_where.prox : "", 
+                     " Please contact the device maintainer.\n",
+             (int)help_where.block, (int)help_where.line, help_where.error,
+             help_where.prox ? "Near '" : "",
+             help_where.prox ? 15 : 0, help_where.prox ? 15 : 0,
+             help_where.prox ? help_where.prox : "",
                  help_where.prox ? "'" : "");
     cleanHelp (&top);
     return failed;
@@ -15048,7 +15055,7 @@ while (TRUE) {
 
         fprintf (st, "\n    Additional information available:\n\n");
         for (i = 0; i < topic->kids; i++) {
-            strlcpy (tbuf, topic->children[i]->title + 
+            strlcpy (tbuf, topic->children[i]->title +
                     ((topic->children[i]->flags & HLP_MAGIC_TOPIC)? 1 : 0),
                     sizeof (tbuf));
             for (p = tbuf; *p; p++) {
@@ -15202,13 +15209,13 @@ if (fp == NULL) {
         if ((p = strrchr (fbuf, '\\'))) {
             p[1] = '\0';
             d = "%s\\";
-            } 
+            }
         else {
             if ((p = strrchr (fbuf, '/'))) {
                 p[1] = '\0';
                 d = "%s/";
 #ifdef VMS
-                } 
+                }
             else {
                 if ((p = strrchr (fbuf, ']'))) {
                     p[1] = '\0';
@@ -15286,7 +15293,7 @@ return r;
 
 /*
  * Expression evaluation package
- * 
+ *
  * Derived from code provided by Gabriel Pizzolato
  */
 
@@ -15378,10 +15385,10 @@ strcpy (data, this_Stack->elements[this_Stack->pointer-1].data);
 --this_Stack->pointer;
 
 if (*op)
-    sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Popping '%s'(precedence %d)]\n", 
+    sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Popping '%s'(precedence %d)]\n",
                                                 this_Stack->id, (*op)->string, (*op)->precedence);
 else
-    sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Popping %s]\n", 
+    sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Popping %s]\n",
                                                 this_Stack->id, data);
 
 return TRUE;                      /* Success */
@@ -15406,10 +15413,10 @@ strlcpy (this_Stack->elements[this_Stack->pointer].data, data, sizeof (this_Stac
 ++this_Stack->pointer;
 
 if (op)
-    sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Pushing '%s'(precedence %d)]\n", 
+    sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Pushing '%s'(precedence %d)]\n",
                                                 this_Stack->id, op->string, op->precedence);
 else
-    sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Pushing %s]\n", 
+    sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Pushing %s]\n",
                                                 this_Stack->id, data);
 
 return TRUE;                      /* Success */
@@ -15427,10 +15434,10 @@ strcpy (data, this_Stack->elements[this_Stack->pointer-1].data);
 *op = this_Stack->elements[this_Stack->pointer-1].op;
 
 if (*op)
-    sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Topping '%s'(precedence %d)]\n", 
+    sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Topping '%s'(precedence %d)]\n",
                                                 this_Stack->id, (*op)->string, (*op)->precedence);
 else
-    sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Topping %s]\n", 
+    sim_debug (SIM_DBG_EXP_STACK, &sim_scp_dev, "[Stack %d - Topping %s]\n",
                                                 this_Stack->id, data);
 
 return TRUE;                      /* Success */
@@ -15579,8 +15586,8 @@ static t_svalue _op_str_gt (const char *str1, const char *str2)
 return (0 > _i_strcmp (str2, str1));
 }
 
-/* 
- * The order of elements in this array is significant.  
+/*
+ * The order of elements in this array is significant.
  * Care must be taken so that longer strings which have
  * shorter strings contained in them must come first.
  * For example "!=" must come before "!".
@@ -15736,8 +15743,8 @@ return cptr;
 }
 
 /*
- * Translate a string containing an infix ordered expression 
- * into a stack containing that expression in postfix order 
+ * Translate a string containing an infix ordered expression
+ * into a stack containing that expression in postfix order
  */
 static const char *sim_into_postfix (Stack *stack1, const char *cptr, t_stat *stat, t_bool parens_required)
 {
@@ -15837,7 +15844,7 @@ if (sim_isalpha (*data) || (*data == '_')) {
     REG *rptr = NULL;
     DEVICE *dptr = sim_dfdev;
     const char *dot;
-    
+
     dot = strchr (data, '.');
     if (dot) {
         char devnam[CBUFSIZE];
@@ -15896,7 +15903,7 @@ return ((*gptr == '\0') && (*string));
 }
 
 /*
- * Evaluate a given stack1 containing a postfix expression 
+ * Evaluate a given stack1 containing a postfix expression
  */
 static t_svalue sim_eval_postfix (Stack *stack1, t_stat *stat)
 {
@@ -15911,10 +15918,10 @@ char temp_string[CBUFSIZE + 2];
 while (!isempty_Stack(stack1)) {
     pop_Stack (stack1, temp_data, &temp_op);
     if (temp_op)
-        sim_debug (SIM_DBG_EXP_EVAL, &sim_scp_dev, "[Expression element: %s (%d)\n", 
+        sim_debug (SIM_DBG_EXP_EVAL, &sim_scp_dev, "[Expression element: %s (%d)\n",
                                                    temp_op->string, temp_op->precedence);
     else
-        sim_debug (SIM_DBG_EXP_EVAL, &sim_scp_dev, "[Expression element: %s\n", 
+        sim_debug (SIM_DBG_EXP_EVAL, &sim_scp_dev, "[Expression element: %s\n",
                                                    temp_data);
     push_Stack (stack2, temp_data, temp_op);
     }
@@ -15940,7 +15947,7 @@ while (!isempty_Stack(stack2)) {
         if (temp_op->unary)
             strlcpy (item2, "0", sizeof (item2));
         else {
-            if ((!pop_Stack (stack1, item2, &op2)) && 
+            if ((!pop_Stack (stack1, item2, &op2)) &&
                 (temp_op->string[0] != '-') &&
                 (temp_op->string[0] != '+')) {
                 *stat = SCPE_INVEXPR;
@@ -15992,7 +15999,7 @@ return cptr;
 
 /*
  * To avoid Coverity complaints about the use of rand() we define the function locally
- * This implementation of Lehmer's minimal standard algorithm is derived 
+ * This implementation of Lehmer's minimal standard algorithm is derived
  * from the integer solution provided in:
  " "Communications of the ACM, October 1988, Volume 31, Number 10, page 1195"
  */
@@ -16072,7 +16079,7 @@ MFlush (MFILE *f)
 f->pos = 0;
 }
 
-/* FMwrite() returns 1 (TRUE) if all data was writting, 0 (FALSE) indicates
+/* FMwrite() returns 1 (TRUE) if all data was written, 0 (FALSE) indicates
    fewer than the requested number of bytes were written. N.B. this function
    is only called in one place and its return value isn't checked.*/
 static int
@@ -16093,8 +16100,8 @@ free (f);
 
 /*
  * This sanity check walks through the all of simulator's device registers
- * to verify that each contains a reasonable description of a method to 
- * access the devices simulator data and that description stays within the 
+ * to verify that each contains a reasonable description of a method to
+ * access the devices simulator data and that description stays within the
  * device state variables it is supposed to reference.
  */
 
@@ -16126,7 +16133,7 @@ for (i = 0; (dptr = devices[i]) != NULL; i++) {
             }
 
         if (sim_switches & SWMASK ('R'))            /* Debug output */
-            sim_printf ("%5s:%-9.9s %s(rdx=%u, wd=%u, off=%u, dep=%u, strsz=%" SIZE_T_FMT "u, objsz=%" SIZE_T_FMT "u, elesz=%" SIZE_T_FMT "u, rsz=%" SIZE_T_FMT "u, %s %s%s membytes=%" SIZE_T_FMT "u, macro=%s)\n", dptr->name, rptr->name, rptr->macro, 
+            sim_printf ("%5s:%-9.9s %s(rdx=%u, wd=%u, off=%u, dep=%u, strsz=%" SIZE_T_FMT "u, objsz=%" SIZE_T_FMT "u, elesz=%" SIZE_T_FMT "u, rsz=%" SIZE_T_FMT "u, %s %s%s membytes=%" SIZE_T_FMT "u, macro=%s)\n", dptr->name, rptr->name, rptr->macro,
                         rptr->radix, rptr->width, rptr->offset, rptr->depth, rptr->stride, rptr->obj_size, rptr->size, rsz, rptr->desc ? rptr->desc : "",
                         (rptr->flags & REG_FIT) ? "REG_FIT" : "", (rptr->flags & REG_VMIO) ? " REG_VMIO" : "",
                         memsize, rptr->macro ? rptr->macro : "");
@@ -16185,13 +16192,13 @@ static struct validation_test {
 static UNIT validate_units[3];
 
 static DEVICE validate_test = {
-    "TEST-REG", validate_units, NULL, NULL, 
+    "TEST-REG", validate_units, NULL, NULL,
     3, 16, 22, 4, 16, 16};
 
 static t_stat test_register_validation (void)
 {
 struct validation_test *v;
-DEVICE *v_devs[] = {&validate_test, 
+DEVICE *v_devs[] = {&validate_test,
                    NULL};
 
 if (sim_switches & SWMASK ('T'))
@@ -16303,7 +16310,7 @@ while (t->function_name) {
         remainder = t->function (input, gbuf, d->end_char);
         if (sim_switches & SWMASK ('T'))
             sim_messagef (SCPE_OK, "%s (\"%s\", gbuf, %s);\n", t->function_name, input, end_char_string);
-        if ((0 != strcmp (gbuf, d->expected_result)) || 
+        if ((0 != strcmp (gbuf, d->expected_result)) ||
             (remainder == NULL) || (0 != strcmp (remainder, d->expected_remainder))) {
             if (0 != strcmp (gbuf, d->expected_result))
                 result = sim_messagef (SCPE_IERR, "function: %s (\"%s\", gbuf, %s); returned an unexpected result string: \"%s\" instead of \"%s\"\n", t->function_name, input, end_char_string, gbuf, d->expected_result);
@@ -16337,9 +16344,9 @@ static struct parse_arg_function_test {
     } parse_arg_function_tests[] = {
         {"1 2 3 4",
                  {5, {"", "1", "2", "3", "4", NULL}}},
-        {"'1 2 3 4'",  
+        {"'1 2 3 4'",
                  {2, {"", "1 2 3 4", NULL}}},
-        {"1 \"2\" 3 4",  
+        {"1 \"2\" 3 4",
                  {5, {"", "1", "2", "3", "4", NULL}}},
         {NULL}
     };
@@ -16527,7 +16534,7 @@ return SCPE_OK;
 }
 
 /*
- * Compiled in unit tests for the various device oriented library 
+ * Compiled in unit tests for the various device oriented library
  * modules: sim_card, sim_disk, sim_tape, sim_ether, sim_tmxr, etc.
  */
 
diff --git a/scp.h b/scp.h
index 5ef3bde..04199d6 100644
--- a/scp.h
+++ b/scp.h
@@ -23,7 +23,7 @@
    be used in advertising or otherwise to promote the sale, use or other dealings
    in this Software without prior written authorization from Robert M Supnik.
 
-   05-Dec-10    MP      Added macro invocation of sim_debug 
+   05-Dec-10    MP      Added macro invocation of sim_debug
    09-Aug-06    JDB     Added assign_device and deassign_device
    14-Jul-06    RMS     Added sim_activate_abs
    06-Jan-06    RMS     Added fprint_stopped_gen
@@ -253,7 +253,7 @@ void sim_perror (const char *msg);
 t_stat sim_call_argv (int (*main_like)(int argc, char *argv[]), const char *cptr);
 t_stat sim_messagef (t_stat stat, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
 void sim_data_trace(DEVICE *dptr, UNIT *uptr, const uint8 *data, const char *position, size_t len, const char *txt, uint32 reason);
-void sim_debug_bits_hdr (uint32 dbits, DEVICE* dptr, const char *header, 
+void sim_debug_bits_hdr (uint32 dbits, DEVICE* dptr, const char *header,
     BITFIELD* bitdefs, uint32 before, uint32 after, int terminate);
 void sim_debug_bits (uint32 dbits, DEVICE* dptr, BITFIELD* bitdefs,
     uint32 before, uint32 after, int terminate);
@@ -357,13 +357,13 @@ extern t_stat parse_sym (CONST char *cptr, t_addr addr, UNIT *uptr, t_value *val
     int32 sw);
 
 /* The per-simulator init routine is a weak global that defaults to NULL
-   The other per-simulator pointers can be overrriden by the init routine
+   The other per-simulator pointers can be overridden by the init routine
 
 extern void (*sim_vm_init) (void);
 
    This routine is no longer invoked this way since it doesn't work reliably
-   on all simh supported compile environments.  A simulator that needs these 
-   initializations can perform them in the CPU device reset routine which will 
+   on all simh supported compile environments.  A simulator that needs these
+   initializations can perform them in the CPU device reset routine which will
    always be called before anything else can be processed.
 
  */
diff --git a/scp_help.h b/scp_help.h
index 980f9e5..8a58477 100644
--- a/scp_help.h
+++ b/scp_help.h
@@ -84,7 +84,7 @@
  * For these cases, ?#, where # is a 1-based parameter number, can be used
  * to selectively include a topic.  If the specified parameter is TRUE
  * (a string with the value "T", "t" or '1'), the topic will be visible.
- * If the parameter is FALSE (NULL, or a string with any other value), 
+ * If the parameter is FALSE (NULL, or a string with any other value),
  * the topic will not be visible.
  *
  * If it can be determined at compile time whether the topic in question
@@ -95,7 +95,7 @@
  * Guidelines:
  *   Help should be concise and easy to understand.
  *
- *   The main topic should be short - less than a sceenful when presented with the
+ *   The main topic should be short - less than a screenful when presented with the
  *   subtopic list.
  *
  *   Keep line lengths to 76 columns or less.
@@ -107,7 +107,7 @@
  *     Hardware Description - The details of the hardware.  Feeds & speeds are OK here.
  *          Models          -   If the device was offered in distinct models, a subtopic for each.
  *          Registers       -   Register descriptions
- *            
+ *
  *     Configuration         - How to configure the device under SimH.  SET commands.
  *          Operating System -   If the device needs special configuration for a particular
  *                               OS, a subtopic for each such OS goes here.
@@ -126,7 +126,7 @@
  *
  *     Related Devices       - If devices are configured or used together, list the other devices here.
  *                             E.G. The DEC KMC/DUP are two hardware devices that are closely related;
- *                             The KMC controlls the DUP on behalf of the OS.
+ *                             The KMC controls the DUP on behalf of the OS.
  *
  * This text can be created by any convenient means.  It can be mechanically extracted from the device
  * source, read from a file, or simply entered as a string in the help routine.  To facilitate the latter,
@@ -151,7 +151,7 @@
  *                   UNIT *uptr, int flag, const char *help, char *cptr, ...)
  *
  *  If you need to pass the variable argument list from another routine, use:
- * 
+ *
  *  t_stat scp_vhelp (FILE *st, DEVICE *dptr,
  *                    UNIT *uptr, int flag, const char *help, char *cptr, va_list ap)
  *
@@ -175,12 +175,12 @@
  * to a string.)
  *
  * Lines beginning with ';' will be ignored.
- * 
+ *
  * Here is a worked-out example:
  *
 ;****************************************************************************
  The Whizbang 100 is a DMA line printer controller used on the Whizbang 1000
- and Gurgle 1200 processor familes of the Obsolete Hardware Corporation.
+ and Gurgle 1200 processor families of the Obsolete Hardware Corporation.
 1 Hardware Description
  The Whizbang 100 is specified to operate "any printer you and a friend can
  lift", and speeds up to 0.5 C.
@@ -205,7 +205,7 @@
   Bit 2 ejects the operator
   Bit 3 enables interrupts
 3 Print data register
-  The print data register is thiry-seven bits wide, and accepts data in
+  The print data register is thirty-seven bits wide, and accepts data in
   elephantcode, the precursor to Unicode.  Paper advance is accomplished
   with the Rocket Return and Page Trampoline characters.
 1 Configuration
@@ -217,7 +217,7 @@
 + SET WHIZBANG CODESET ASCII
 +   SET WHIZBANG CODESET ELEPHANTCODE
 
-  The VFU (carriage control tape) is specifed with
+  The VFU (carriage control tape) is specified with
 + SET WHIZBANG TAPE vfufile
 2 WOS
   Under WOS, the device will only work at LooneyBus slot 9
@@ -231,7 +231,7 @@
 2 Examples
   TBS
 1 Operation
-  Specify the host file to receive output using the 
+  Specify the host file to receive output using the
 +ATTACH WHIZBANG filespec
  command.
 1 Monitoring
diff --git a/sim_card.c b/sim_card.c
index fb5673e..d107273 100644
--- a/sim_card.c
+++ b/sim_card.c
@@ -22,7 +22,7 @@
    This is the standard card reader.
    This is the standard card punch.
 
-   Input formats are accepted in a variaty of formats:
+   Input formats are accepted in a variety of formats:
         Standard ASCII: one record per line.
                 returns are ignored.
                 tabs are expanded to modules 8 characters.
@@ -44,7 +44,7 @@
                 Bits 5-0 are character.
 
         CBN Format:
-                Each record 160 charaters.
+                Each record 160 characters.
                 First char has bit 7 set. Rest set to 0.
                 Bit 6 is odd parity.
                 Bit 5-0 of first character are top 6 bits
@@ -60,7 +60,7 @@
     is not enough octal numbers to span a full card the remainder of the
     card will not be punched.
 
-    Also ~eor, will generate a 7/8/9 punch card. An ~eof will gernerate a
+    Also ~eor, will generate a 7/8/9 punch card. An ~eof will generate a
     6/7/9 punch card, and a ~eoi will generate a 6/7/8/9 punch.
 
     A single line of ~ will set the EOF flag when that card is read.
@@ -163,7 +163,7 @@ static const uint16          ascii_to_hol_026[128] = {
 /* Set for Burrough codes */
 static const uint16          ascii_to_hol_029[128] = {
    /* Control                              */
-    0xf000,0xf000,0x0881,0xf000,0xf000,0xf000,0xf000,0xf000,    /*0-37*/
+    0xf000,0xf000,0xf000,0xf000,0xf000,0xf000,0xf000,0xf000,    /*0-37*/
    /*Control*/
     0xf000,0xf000,0xf000,0xf000,0xf000,0xf000,0xf000,0xf000,
    /*Control*/
@@ -252,7 +252,7 @@ static const uint16          ascii_to_dec_029[128] = {
 
 #if SIMH_EVER_USES_THIS
 /* This is a static const that isn't referenced in this code.
- * Kept for historical refernce.
+ * Kept for historical reference.
  */
 static const uint16          ascii_to_hol_ebcdic[128] = {
    /* Control                              */
@@ -434,7 +434,7 @@ static struct card_formats fmts[] = {
 
 /* Conversion routines */
 
-/* Convert BCD character into hollerith code */
+/* Convert BCD character into Hollerith code */
 uint16
 sim_bcd_to_hol(uint8 bcd) {
     uint16      hol;
@@ -479,7 +479,7 @@ sim_bcd_to_hol(uint8 bcd) {
     return hol;
 }
 
-/* Returns the BCD of the hollerith code or 0x7f if error */
+/* Returns the BCD of the Hollerith code or 0x7f if error */
 uint8
 sim_hol_to_bcd(uint16 hol) {
     uint8                bcd;
@@ -529,7 +529,7 @@ sim_hol_to_bcd(uint16 hol) {
     return bcd;
 }
 
-/* Convert EBCDIC character into hollerith code */
+/* Convert EBCDIC character into Hollerith code */
 uint16
 sim_ebcdic_to_hol(uint8 ebcdic) {
    return ebcdic_to_hol[ebcdic];
@@ -537,7 +537,7 @@ sim_ebcdic_to_hol(uint8 ebcdic) {
 
 
 
-/* Returns the BCD of the hollerith code or 0x7f if error */
+/* Returns the BCD of the Hollerith code or 0x7f if error */
 uint16
 sim_hol_to_ebcdic(uint16 hol) {
     return hol_to_ebcdic[hol];
@@ -614,8 +614,7 @@ sim_read_card(UNIT * uptr, uint16 image[80])
              int          ok = 1;
              for (i = 0; i < 80; i++) {
                  out[i] = data->hol_to_ascii[(int)(*img)[i]];
-                 /* Handle case where table entry is 0 or invalid */
-                 if (out[i] == 0 || out[i] == 0xff) {
+                 if (out[i] == 0xff) {
                     ok = 0;
                  }
              }
@@ -687,7 +686,7 @@ _sim_parse_card(UNIT *uptr, DEVICE *dptr, struct _card_buffer *buf, uint16 (*ima
     unsigned int          mode;
     uint16                temp;
     size_t                i;
-    unsigned char         c;
+    char                  c;
     size_t                col;
 
     sim_debug(DEBUG_CARD, dptr, "Read card ");
@@ -818,9 +817,6 @@ _sim_parse_card(UNIT *uptr, DEVICE *dptr, struct _card_buffer *buf, uint16 (*ima
                     col = 80;
                     i--;
                     break;
-                case 0xac:              /* Handle EBCDIC not symbol */
-                    (*image)[col++] = 0x406;
-                    break;
                 default:
                     sim_debug(DEBUG_CARD, dptr, "%c", c);
                     if ((uptr->flags & MODE_LOWER) == 0)
@@ -837,10 +833,8 @@ _sim_parse_card(UNIT *uptr, DEVICE *dptr, struct _card_buffer *buf, uint16 (*ima
                            temp = ascii_to_dec_029[(int)c];
                            break;
                     }
-                    if (temp & 0xf000) {
+                    if (temp & 0xf000)
                         (*image)[0] |= CARD_ERR;
-                        sim_debug(DEBUG_CARD, dptr, "<<");
-                    }
                     (*image)[col++] = temp & 0xfff;
                 }
             }
@@ -993,7 +987,7 @@ _sim_read_deck(UNIT * uptr, int eof)
 
     buf.len = 0;
     buf.size = 0;
-    buf.buffer[0] = 0; /* Initialize bufer to empty */
+    buf.buffer[0] = 0; /* Initialize buffer to empty */
 
     /* Slurp up current file */
     do {
@@ -1020,7 +1014,7 @@ _sim_read_deck(UNIT * uptr, int eof)
                    sim_uname(uptr), uptr->filename, sim_error_text(r), cards);
         }
         data->hopper_cards++;
-        /* Move data to start at begining of buffer */
+        /* Move data to start at beginning of buffer */
         /* Data is moved down to simplify the decoding of one card */
         l = buf.len - buf.size;
         j = buf.size;
@@ -1065,7 +1059,7 @@ sim_punch_card(UNIT * uptr, uint16 image[80])
 /* Convert word record into column image */
 /* Check output type, if auto or text, try and convert record to bcd first */
 /* If failed and text report error and dump what we have */
-/* Else if binary or not convertable, dump as image */
+/* Else if binary or not convertible, dump as image */
 
     /* Try to convert to text */
     uint8                out[512];
diff --git a/sim_card.h b/sim_card.h
index 44e7818..c29cec4 100644
--- a/sim_card.h
+++ b/sim_card.h
@@ -22,7 +22,7 @@
    This is the standard card reader.
    This is the standard card punch.
 
-   Input formats are accepted in a variaty of formats:
+   Input formats are accepted in a variety of formats:
         Standard ASCII: one record per line.
                 returns are ignored.
                 tabs are expanded to modules 8 characters.
@@ -44,7 +44,7 @@
                 Bits 5-0 are character.
 
         CBN Format:
-                Each record 160 charaters.
+                Each record 160 characters.
                 First char has bit 7 set. Rest set to 0.
                 Bit 6 is odd parity.
                 Bit 5-0 of first character are top 6 bits
@@ -60,14 +60,14 @@
 
 
     ASCII mode recognizes some additional forms of input which allows the
-    intermixing of binary cards with text cards. 
+    intermixing of binary cards with text cards.
 
     Lines beginning with ~raw are taken as a number of 4 digit octal values
     with represent each column of the card from 12 row down to 9 row. If there
-    is not enough octal numbers to span a full card the remainder of the 
+    is not enough octal numbers to span a full card the remainder of the
     card will not be punched.
 
-    Also ~eor, will generate a 7/8/9 punch card. An ~eof will gernerate a
+    Also ~eor, will generate a 7/8/9 punch card. An ~eof will generate a
     6/7/9 punch card, and a ~eoi will generate a 6/7/8/9 punch.
 
     A single line of ~ will set the EOF flag when that card is read.
@@ -110,7 +110,7 @@ typedef int t_cdstat;
 #define CDSE_OK     0   /* Good */
 #define CDSE_EOF    1   /* End of File */
 #define CDSE_EMPTY  2   /* Input Hopper Empty */
-#define CDSE_ERROR  3   /* Error Card Read */  
+#define CDSE_ERROR  3   /* Error Card Read */
 
 /* Generic routines. */
 
diff --git a/sim_console.c b/sim_console.c
index 71e2710..1c0e82d 100644
--- a/sim_console.c
+++ b/sim_console.c
@@ -34,33 +34,33 @@
    10-Nov-14    JDB     Added -N option to SET CONSOLE LOG and SET CONSOLE DEBUG
    02-Jan-14    RMS     Added tab stop routines
    18-Mar-12    RMS     Removed unused reference to sim_switches (Dave Bryan)
-   07-Dec-11    MP      Added sim_ttisatty to support reasonable behaviour (i.e. 
+   07-Dec-11    MP      Added sim_ttisatty to support reasonable behaviour (i.e.
                         avoid in infinite loop) in the main command input
-                        loop when EOF is detected and input is coming from 
+                        loop when EOF is detected and input is coming from
                         a file (or a null device: /dev/null or NUL:) This may
-                        happen when a simulator is running in a background 
+                        happen when a simulator is running in a background
                         process.
    17-Apr-11    MP      Cleaned up to support running in a background/detached
                         process
-   20-Jan-11    MP      Fixed support for BREAK key on Windows to account 
+   20-Jan-11    MP      Fixed support for BREAK key on Windows to account
                         for/ignore other keyboard Meta characters.
    18-Jan-11    MP      Added log file reference count support
    17-Jan-11    MP      Added support for a "Buffered" behaviors which include:
                         - If Buffering is enabled and Telnet is enabled, a
-                          telnet connection is not required for simulator 
+                          telnet connection is not required for simulator
                           operation (instruction execution).
-                        - If Buffering is enabled, all console output is 
+                        - If Buffering is enabled, all console output is
                           written to the buffer at all times (deleting the
                           oldest buffer contents on overflow).
-                        - when a connection is established on the console 
+                        - when a connection is established on the console
                           telnet port, the whole contents of the Buffer is
-                          presented on the telnet session and connection 
+                          presented on the telnet session and connection
                           will then proceed as if the connection had always
                           been there.
                         This concept allows a simulator to run in the background
-                        and when needed a console session to be established.  
-                        The "when needed" case usually will be interested in 
-                        what already happened before looking to address what 
+                        and when needed a console session to be established.
+                        The "when needed" case usually will be interested in
+                        what already happened before looking to address what
                         to do, hence the buffer contents being presented.
    28-Dec-10    MP      Added support for BREAK key on Windows
    30-Sep-06    RMS     Fixed non-printable characters in KSR mode
@@ -94,7 +94,7 @@
    25-Jan-97    RMS     Added POSIX terminal I/O support
    02-Jan-97    RMS     Fixed bug in sim_poll_kbd
 
-   This module implements the following routines to support terminal and 
+   This module implements the following routines to support terminal and
    Remote Console I/O:
 
    sim_poll_kbd                 poll for keyboard input
@@ -158,7 +158,7 @@
 #define MIN(a,b)  (((a) <= (b)) ? (a) : (b))
 #endif
 
-/* Forward Declaraations of Platform specific routines */
+/* Forward declarations of platform specific routines */
 
 static t_stat sim_os_poll_kbd (void);
 static t_bool sim_os_poll_kbd_ready (int ms_timeout);
@@ -257,9 +257,9 @@ return "Console telnet support";
 }
 
 DEVICE sim_con_telnet = {
-    "CON-TELNET", sim_con_units, sim_con_reg, sim_con_mod, 
-    2, 0, 0, 0, 0, 0, 
-    NULL, NULL, sim_con_reset, NULL, sim_con_attach, sim_con_detach, 
+    "CON-TELNET", sim_con_units, sim_con_reg, sim_con_mod,
+    2, 0, 0, 0, 0, 0,
+    NULL, NULL, sim_con_reset, NULL, sim_con_attach, sim_con_detach,
     NULL, DEV_DEBUG | DEV_NOSAVE, 0, sim_con_debug,
     NULL, NULL, NULL, NULL, NULL, sim_con_telnet_description};
 TMLN sim_con_ldsc = { 0 };                                          /* console line descr */
@@ -325,7 +325,7 @@ static t_stat sim_con_detach (UNIT *uptr)
 return sim_set_notelnet (0, NULL);
 }
 
-/* Forward declaratations */
+/* Forward declarations */
 
 static t_stat sim_os_fd_isatty (int fd);
 
@@ -505,9 +505,9 @@ return "Remote Console Facility";
 }
 
 DEVICE sim_remote_console = {
-    "REM-CON", NULL, NULL, sim_rem_con_mod, 
-    0, 0, 0, 0, 0, 0, 
-    NULL, NULL, sim_rem_con_reset, NULL, NULL, NULL, 
+    "REM-CON", NULL, NULL, sim_rem_con_mod,
+    0, 0, 0, 0, 0, 0,
+    NULL, NULL, sim_rem_con_reset, NULL, NULL, NULL,
     NULL, DEV_DEBUG | DEV_NOSAVE, 0, sim_rem_con_debug,
     NULL, NULL, NULL, NULL, NULL, sim_rem_con_description};
 
@@ -711,7 +711,7 @@ if (c >= 0) {                                           /* poll connect */
     tmxr_linemsgf (lp, "%s Remote Console\r\n"
                        "Enter single commands or to enter multiple command mode enter the %s character\r"
                        "%s",
-                       sim_name, wru_name, 
+                       sim_name, wru_name,
                        ((sim_rem_master_mode && (c == 0)) ? "" : "\nSimulator Running..."));
     if (sim_rem_master_mode && (c == 0))                /* Master Mode session? */
         rem->single_mode = FALSE;                       /*  start in multi-command mode */
@@ -878,7 +878,7 @@ return SCPE_OK;
 static t_stat _sim_rem_message (const char *cmd, t_stat stat)
 {
 CTAB *cmdp = NULL;
-t_stat stat_nomessage = stat & SCPE_NOMESSAGE;  /* extract possible message supression flag */
+t_stat stat_nomessage = stat & SCPE_NOMESSAGE;  /* extract possible message suppression flag */
 
 cmdp = find_cmd (cmd);
 stat = SCPE_BARE_STATUS(stat);                  /* remove possible flag */
@@ -906,7 +906,7 @@ if ((!sim_oline) && (sim_log)) {
         tmxr_linemsgf (lp, "%s", cbuf);
     }
 sim_oline = NULL;
-if ((rem->act == NULL) && 
+if ((rem->act == NULL) &&
     (!tmxr_input_pending_ln (lp))) {
     size_t unwritten;
 
@@ -1001,7 +1001,7 @@ if ((ep != NULL) && (*ep != ';')) {             /* if a quoted string is present
         if (ep [0] == '\\' && ep [1] == quote)  /*   if an escaped quote sequence follows */
             ep = ep + 2;                        /*     then skip over the pair */
         else                                    /*   otherwise */
-            ep = ep + 1;                        /*     skip the non-quote character */  
+            ep = ep + 1;                        /*     skip the non-quote character */
     ep = strchr (ep, ';');                      /* the next semicolon is outside the quotes if it exists */
     }
 
@@ -1019,7 +1019,7 @@ else {
 return buf;
 }
 
-/* 
+/*
     Parse and setup Remote Console REPEAT command:
        REPEAT EVERY nnn USECS Command {; command...}
  */
@@ -1100,7 +1100,7 @@ return stat;
 }
 
 
-/* 
+/*
     Parse and setup Remote Console REPEAT command:
        COLLECT nnn SAMPLES EVERY nnn CYCLES reg{,reg...}
  */
@@ -1396,8 +1396,8 @@ CTAB *basecmdp = NULL;
 uint32 read_start_time = 0;
 
 tmxr_poll_rx (&sim_rem_con_tmxr);                      /* poll input */
-for (i=(was_active_command ? sim_rem_cmd_active_line : 0); 
-     (i < sim_rem_con_tmxr.lines) && (!active_command); 
+for (i=(was_active_command ? sim_rem_cmd_active_line : 0);
+     (i < sim_rem_con_tmxr.lines) && (!active_command);
      i++) {
     REMOTE *rem = &sim_rem_consoles[i];
     t_bool master_session = (sim_rem_master_mode && (i == 0));
@@ -1553,7 +1553,7 @@ for (i=(was_active_command ? sim_rem_cmd_active_line : 0);
                 c = tmxr_getc_ln (lp);
                 if (!(TMXR_VALID & c)) {
                     tmxr_send_buffered_data (lp);       /* flush any buffered data */
-                    if (!master_session && 
+                    if (!master_session &&
                         rem->read_timeout &&
                         ((sim_os_msec() - read_start_time)/1000 >= rem->read_timeout)) {
                         while (rem->buf_ptr > 0) {      /* Erase current input line */
@@ -1879,7 +1879,7 @@ if (sim_rem_cmd_active_line != -1) {
         return SCPE_REMOTE;                                 /* force sim_instr() to exit to process command */
     }
 else
-    sim_activate_after(uptr, 100000);                       /* check again in 100 milliaeconds */
+    sim_activate_after(uptr, 100000);                       /* check again in 100 milliseconds */
 if (sim_rem_master_was_enabled && !sim_rem_master_mode) {   /* Transitioning out of master mode? */
     lp = &sim_rem_con_tmxr.ldsc[0];
     tmxr_linemsgf (lp, "Non Master Mode Session...");       /* report transition */
@@ -2059,7 +2059,7 @@ return sim_rem_master_mode &&                                           /* maste
 /* In master mode, commands are subsequently processed from the
    primary/initial (master mode) remote console session.  Commands
    are processed from that source until that source disables master
-   mode or the simulator exits 
+   mode or the simulator exits
  */
 
 static t_stat sim_set_rem_master (int32 flag, CONST char *cptr)
@@ -2092,7 +2092,7 @@ if (sim_rem_master_mode) {
         sim_activate (rem_con_data_unit, -1);
         stat = run_cmd (RU_GO, "");
         if (stat != SCPE_TTMO) {
-            stat_nomessage = stat & SCPE_NOMESSAGE;         /* extract possible message supression flag */
+            stat_nomessage = stat & SCPE_NOMESSAGE;         /* extract possible message suppression flag */
             stat = _sim_rem_message ("RUN", stat);
             }
         brk_action = sim_brk_replace_act (NULL);
@@ -2203,7 +2203,7 @@ if (sim_devices[0]->dradix == 16)
 else
     fprintf (st, "pchar mask = %o", sim_tt_pchar);
 if (sim_tt_pchar) {
-    static const char *pchars[] = {"NUL(^@)", "SOH(^A)", "STX(^B)", "ETX(^C)", "EOT(^D)", "ENQ(^E)", "ACK(^F)", "BEL(^G)", 
+    static const char *pchars[] = {"NUL(^@)", "SOH(^A)", "STX(^B)", "ETX(^C)", "EOT(^D)", "ENQ(^E)", "ACK(^F)", "BEL(^G)",
                                    "BS(^H)" , "HT(^I)",  "LF(^J)",  "VT(^K)",  "FF(^L)",  "CR(^M)",  "SO(^N)",  "SI(^O)",
                                    "DLE(^P)", "DC1(^Q)", "DC2(^R)", "DC3(^S)", "DC4(^T)", "NAK(^U)", "SYN(^V)", "ETB(^W)",
                                    "CAN(^X)", "EM(^Y)",  "SUB(^Z)", "ESC",     "FS",      "GS",      "RS",      "US"};
@@ -2258,14 +2258,14 @@ cptr = get_glyph_nc (cptr, gbuf, 0);                    /* get file name */
 if (*cptr != 0)                                         /* now eol? */
     return SCPE_2MARG;
 sim_set_logoff (0, NULL);                               /* close cur log */
-r = sim_open_logfile (gbuf, (sim_switches & SWMASK ('B')) == SWMASK ('B'), 
+r = sim_open_logfile (gbuf, (sim_switches & SWMASK ('B')) == SWMASK ('B'),
                             &sim_log, &sim_log_ref);    /* open log */
 if (r != SCPE_OK)                                       /* error? */
     return r;
 if ((!sim_quiet) && (!(sim_switches & SWMASK ('Q'))))
-    fprintf (stdout, "Logging to file \"%s\"\n", 
+    fprintf (stdout, "Logging to file \"%s\"\n",
              sim_logfile_name (sim_log, sim_log_ref));
-fprintf (sim_log, "Logging to file \"%s\"\n", 
+fprintf (sim_log, "Logging to file \"%s\"\n",
              sim_logfile_name (sim_log, sim_log_ref));  /* start of log */
 time(&now);
 if ((!sim_quiet) && (!(sim_switches & SWMASK ('Q'))))
@@ -2296,7 +2296,7 @@ t_stat sim_show_log (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, CONST char
 if (cptr && (*cptr != 0))
     return SCPE_2MARG;
 if (sim_log)
-    fprintf (st, "Logging enabled to \"%s\"\n", 
+    fprintf (st, "Logging enabled to \"%s\"\n",
                  sim_logfile_name (sim_log, sim_log_ref));
 else
     fprintf (st, "Logging disabled\n");
@@ -2309,9 +2309,9 @@ int32 sim_set_deb_switches (int32 switches)
 {
 int32 old_deb_switches = sim_deb_switches;
 
-sim_deb_switches = switches & 
-                   (SWMASK ('R') | SWMASK ('P') | 
-                    SWMASK ('T') | SWMASK ('A') | 
+sim_deb_switches = switches &
+                   (SWMASK ('R') | SWMASK ('P') |
+                    SWMASK ('T') | SWMASK ('A') |
                     SWMASK ('F') | SWMASK ('N') |
                     SWMASK ('B') | SWMASK ('E') |
                     SWMASK ('D') );                 /* save debug switches */
@@ -2370,7 +2370,7 @@ if (sim_deb_switches & SWMASK ('F'))
 if (sim_deb_switches & SWMASK ('E'))
     sim_messagef (SCPE_OK, "   Debug messages containing blob data in EBCDIC will display in readable form\n");
 if (sim_deb_switches & SWMASK ('B'))
-    sim_messagef (SCPE_OK, "   Debug messages will be written to a %u MB circular memory buffer\n", 
+    sim_messagef (SCPE_OK, "   Debug messages will be written to a %u MB circular memory buffer\n",
                                 (unsigned int)buffer_size);
 time(&now);
 if (!sim_quiet) {
@@ -2432,7 +2432,7 @@ int32 i;
 if (cptr && (*cptr != 0))
     return SCPE_2MARG;
 if (sim_deb) {
-    fprintf (st, "Debug output enabled to \"%s\"\n", 
+    fprintf (st, "Debug output enabled to \"%s\"\n",
                  sim_logfile_name (sim_deb, sim_deb_ref));
     if (sim_deb_switches & SWMASK ('P'))
         fprintf (st, "   Debug messages contain current PC value\n");
@@ -2536,7 +2536,7 @@ t_stat sim_show_telnet (FILE *st, DEVICE *dunused, UNIT *uunused, int32 flag, CO
 {
 if (cptr && (*cptr != 0))
     return SCPE_2MARG;
-if ((sim_con_tmxr.master == 0) && 
+if ((sim_con_tmxr.master == 0) &&
     (sim_con_ldsc.serport == 0))
     fprintf (st, "Connected to console window\n");
 else {
@@ -2544,7 +2544,7 @@ else {
         fprintf (st, "Connected to ");
         tmxr_fconns (st, &sim_con_ldsc, -1);
         }
-    else 
+    else
         if (sim_con_ldsc.sock == 0)
             fprintf (st, "Listening on port %s\n", sim_con_tmxr.port);
         else {
@@ -2790,7 +2790,7 @@ if (!ref)
 return ref->name;
 }
 
-/* Check connection before executing 
+/* Check connection before executing
    (including a remote console which may be required in master mode) */
 
 t_stat sim_check_console (int32 sec)
@@ -2827,7 +2827,7 @@ if (trys == sec) {
     return SCPE_TTMO;                                   /* timed out */
     }
 if (sim_con_ldsc.serport)
-    if (tmxr_poll_conn (&sim_con_tmxr) >= 0) 
+    if (tmxr_poll_conn (&sim_con_tmxr) >= 0)
         sim_con_ldsc.rcve = 1;                          /* rcv enabled */
 if ((sim_con_tmxr.master == 0) ||                       /* serial console or not Telnet? done */
     (sim_con_ldsc.serport))
@@ -2931,7 +2931,7 @@ if (!sim_rem_master_mode) {
         }
     }
 tmxr_poll_rx (&sim_con_tmxr);                               /* poll for input */
-if ((c = (t_stat)tmxr_getc_ln (&sim_con_ldsc))) {           /* any char? */ 
+if ((c = (t_stat)tmxr_getc_ln (&sim_con_ldsc))) {           /* any char? */
     sim_debug (DBG_RCV, &sim_con_telnet, "sim_poll_kbd() tmxr_getc_ln() returning: '%c' (0x%02X)\n", sim_isprint (c & 0xFF) ? c & 0xFF : '.', c);
     return (c & (SCPE_BREAK | 0377)) | SCPE_KFLAG;
     }
@@ -3128,7 +3128,7 @@ if ((md == TTUF_MODE_UC) && (par_mode == TTUF_PAR_MARK))
     fprintf (st, "KSR (UC, MARK parity)");
 else
     fprintf (st, "%s", modes[md]);
-if ((md != TTUF_MODE_8B) && 
+if ((md != TTUF_MODE_8B) &&
     ((md != TTUF_MODE_UC) || (par_mode != TTUF_PAR_MARK))) {
     if (par_mode != 0)
         fprintf (st, ", %s parity", parity[par_mode]);
@@ -3153,8 +3153,8 @@ _console_poll(void *arg)
 int wait_count = 0;
 DEVICE *d;
 
-/* Boost Priority for this I/O thread vs the CPU instruction execution 
-   thread which, in general, won't be readily yielding the processor when 
+/* Boost Priority for this I/O thread vs the CPU instruction execution
+   thread which, in general, won't be readily yielding the processor when
    this thread needs to run */
 sim_os_set_thread_priority (PRIORITY_ABOVE_NORMAL);
 
@@ -3496,11 +3496,11 @@ static DWORD saved_error_mode;
 #define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
 #endif
 
-/* Note: This routine catches all the potential events which some aspect 
-         of the windows system can generate.  The CTRL_C_EVENT won't be 
-         generated by a  user typing in a console session since that 
+/* Note: This routine catches all the potential events which some aspect
+         of the windows system can generate.  The CTRL_C_EVENT won't be
+         generated by a  user typing in a console session since that
          session is in RAW mode.  In general, Ctrl-C on a simulator's
-         console terminal is a useful character to be passed to the 
+         console terminal is a useful character to be passed to the
          simulator.  This code does nothing to disable or affect that. */
 
 #include <signal.h>
@@ -3513,7 +3513,7 @@ ControlHandler(DWORD dwCtrlType)
 
     switch (dwCtrlType)
         {
-        case CTRL_BREAK_EVENT:      // Use CTRL-Break or CTRL-C to simulate 
+        case CTRL_BREAK_EVENT:      // Use CTRL-Break or CTRL-C to simulate
         case CTRL_C_EVENT:          // SERVICE_CONTROL_STOP in debug mode
             int_handler(SIGINT);
             return TRUE;
@@ -3927,11 +3927,11 @@ static t_stat sim_os_ttinit (void)
 sim_debug (DBG_TRC, &sim_con_telnet, "sim_os_ttinit()\n");
 
 cmdfl = fcntl (fileno (stdin), F_GETFL, 0);             /* get old flags  and status */
-/* 
+/*
  * make sure systems with broken termios (that don't honor
- * VMIN=0 and VTIME=0) actually implement non blocking reads.  
- * This will have no negative effect on other systems since 
- * this is turned on and off depending on whether simulation 
+ * VMIN=0 and VTIME=0) actually implement non blocking reads.
+ * This will have no negative effect on other systems since
+ * this is turned on and off depending on whether simulation
  * is running or not.
  */
 runfl = cmdfl | O_NONBLOCK;
@@ -4130,7 +4130,7 @@ else {
 
     mbuf2 = (char *)malloc (3 + strlen(cptr));
     sprintf (mbuf2, "%s%s%s", (sim_switches & SWMASK ('A')) ? "\n" : "",
-                              mbuf, 
+                              mbuf,
                               (sim_switches & SWMASK ('I')) ? "" : "\n");
     free (mbuf);
     mbuf = sim_encode_quoted_string ((uint8 *)mbuf2, strlen (mbuf2));
diff --git a/sim_defs.h b/sim_defs.h
index 3954ca0..fbb32ec 100644
--- a/sim_defs.h
+++ b/sim_defs.h
@@ -212,7 +212,7 @@ extern "C" {
 
 /* Length specific integer declarations */
 
-/* Handle the special/unusual cases first with everything else leveraging stdints.h */
+/* Handle the special/unusual cases first with everything else leveraging stdint.h */
 #if defined (VMS)
 #include <ints.h>
 #elif defined(_MSC_VER) && (_MSC_VER < 1600)
@@ -224,7 +224,7 @@ typedef unsigned __int16 uint16;
 typedef unsigned __int32 uint32;
 #else
 /* All modern/standard compiler environments */
-/* any other environment needa a special case above */
+/* any other environment needs a special case above */
 #include <stdint.h>
 typedef int8_t          int8;
 typedef int16_t         int16;
@@ -435,7 +435,7 @@ typedef uint32          t_addr;
 #define SCPE_MAX_ERR    (SCPE_BASE + 51)                /* Maximum SCPE Error Value */
 #define SCPE_KFLAG      0x10000000                      /* tti data flag */
 #define SCPE_BREAK      0x20000000                      /* tti break flag */
-#define SCPE_NOMESSAGE  0x40000000                      /* message display supression flag */
+#define SCPE_NOMESSAGE  0x40000000                      /* message display suppression flag */
 #define SCPE_BARE_STATUS(stat) ((stat) & ~(SCPE_NOMESSAGE|SCPE_KFLAG|SCPE_BREAK))
 
 /* Print value format codes */
diff --git a/sim_disk.c b/sim_disk.c
index 9a26135..6eb13db 100644
--- a/sim_disk.c
+++ b/sim_disk.c
@@ -28,7 +28,7 @@
    This is the place which hides processing of various disk formats,
    as well as OS-specific direct hardware access.
 
-   25-Jan-11    MP      Initial Implemementation
+   25-Jan-11    MP      Initial Implementation
 
 Public routines:
 
@@ -276,8 +276,8 @@ return NULL;
    processing events for any unit. It is only called when an asynchronous
    thread has called sim_activate() to activate a unit.  The job of this
    routine is to put the unit in proper condition to digest what may have
-   occurred in the asynchrconous thread.
-  
+   occurred in the asynchronous thread.
+
    Since disk processing only handles a single I/O at a time to a
    particular disk device (due to using stdio for the SimH Disk format
    and stdio doesn't have an atomic seek+(read|write) operation),
@@ -487,7 +487,7 @@ switch (DK_GET_FMT (uptr)) {                            /* case on format */
                 sim_switches = 0;
                 sim_quiet = 1;
                 strcpy (path, uptr->filename);
-                sim_disk_attach (uptr, path, ctx->sector_size, ctx->xfer_element_size, 
+                sim_disk_attach (uptr, path, ctx->sector_size, ctx->xfer_element_size,
                                  FALSE, ctx->dbit, NULL, 0, 0);
                 sim_quiet = saved_quiet;
                 sim_switches = saved_switches;
@@ -524,7 +524,7 @@ DEVICE *dptr;
 uint32 dev, unit, count = 0;
 
 if (flag == sim_disk_no_autosize)
-    return sim_messagef (SCPE_ARG, "Autosizing is already %sabled!\n", 
+    return sim_messagef (SCPE_ARG, "Autosizing is already %sabled!\n",
                                     sim_disk_no_autosize ? "dis" : "en");
 for (dev = 0; (dptr = sim_devices[dev]) != NULL; dev++) {
     if ((DEV_TYPE (dptr) != DEV_DISK) ||
@@ -665,7 +665,7 @@ while (tbc) {
     if (i < tbc)                 /* fill */
         memset (&buf[i], 0, tbc-i);
     if ((i == 0) &&             /* Reading at or past EOF? */
-        feof (uptr->fileref))   
+        feof (uptr->fileref))
         i = tbc;                /* return 0's which have already been filled in buffer */
     sectbytes = (i / ctx->sector_size) * ctx->sector_size;
     if (i > sectbytes)
@@ -871,7 +871,7 @@ if (f == DKUF_F_RAW) {
         if (tbuf == NULL)
             return SCPE_MEM;
         /* Partial Sector writes require a read-modify-write sequence for the partial sectors */
-        if (soffset) 
+        if (soffset)
             sim_os_disk_read (uptr, ssaddr, tbuf, NULL, ctx->storage_sector_size);
         sim_os_disk_read (uptr, sladdr, tbuf + (size_t)(sladdr - ssaddr), NULL, ctx->storage_sector_size);
         sim_buf_copy_swapped (tbuf + soffset,
@@ -982,13 +982,13 @@ static t_stat _sim_disk_rdsect_interleave (UNIT *uptr, t_lba lba, uint8 *buf, t_
 struct disk_context *ctx = (struct disk_context *)uptr->disk_ctx;
 t_lba sectno = lba, psa;
 t_stat status;
- 
+
 if (sectsread)
     *sectsread = 0;
 
 do {
     uint16 i, track, sector;
-    
+
     /*
      * Map an LBA address into a physical sector address
      */
@@ -1141,7 +1141,7 @@ typedef struct _ODS2_FileHeader
 
 typedef union _ODS2_Retreval
     {
-        struct 
+        struct
             {
             unsigned fm2___fill   : 14;       /* type specific data               */
             unsigned fm2_v_format : 2;        /* format type code                 */
@@ -1278,31 +1278,31 @@ if ((_DEC_rdsect (uptr, 512 / ctx->sector_size, (uint8 *)&Home, &sects_read, siz
     goto Return_Cleanup;
 CheckSum1 = ODSChecksum (&Home, (uint16)((((char *)&Home.hm2_w_checksum1)-((char *)&Home.hm2_l_homelbn))/2));
 CheckSum2 = ODSChecksum (&Home, (uint16)((((char *)&Home.hm2_w_checksum2)-((char *)&Home.hm2_l_homelbn))/2));
-if ((Home.hm2_l_homelbn == 0) || 
-    (Home.hm2_l_alhomelbn == 0) || 
-    (Home.hm2_l_altidxlbn == 0) || 
-    ((Home.hm2_b_struclev != 2) && (Home.hm2_b_struclev != 5)) || 
-    (Home.hm2_b_strucver == 0) || 
-    (Home.hm2_w_cluster == 0) || 
-    (Home.hm2_w_homevbn == 0) || 
-    (Home.hm2_w_alhomevbn == 0) || 
-    (Home.hm2_w_ibmapvbn == 0) || 
-    (Home.hm2_l_ibmaplbn == 0) || 
-    (Home.hm2_w_resfiles >= Home.hm2_l_maxfiles) || 
-    (Home.hm2_w_ibmapsize == 0) || 
-    (Home.hm2_w_resfiles < 5) || 
+if ((Home.hm2_l_homelbn == 0) ||
+    (Home.hm2_l_alhomelbn == 0) ||
+    (Home.hm2_l_altidxlbn == 0) ||
+    ((Home.hm2_b_struclev != 2) && (Home.hm2_b_struclev != 5)) ||
+    (Home.hm2_b_strucver == 0) ||
+    (Home.hm2_w_cluster == 0) ||
+    (Home.hm2_w_homevbn == 0) ||
+    (Home.hm2_w_alhomevbn == 0) ||
+    (Home.hm2_w_ibmapvbn == 0) ||
+    (Home.hm2_l_ibmaplbn == 0) ||
+    (Home.hm2_w_resfiles >= Home.hm2_l_maxfiles) ||
+    (Home.hm2_w_ibmapsize == 0) ||
+    (Home.hm2_w_resfiles < 5) ||
     (Home.hm2_w_checksum1 != CheckSum1) ||
     (Home.hm2_w_checksum2 != CheckSum2))
     goto Return_Cleanup;
-if ((_DEC_rdsect (uptr, (Home.hm2_l_ibmaplbn+Home.hm2_w_ibmapsize+1) * (512 / ctx->sector_size), 
-                  (uint8 *)&Header, &sects_read, sizeof (Header) / ctx->sector_size, physsectsz)) || 
+if ((_DEC_rdsect (uptr, (Home.hm2_l_ibmaplbn+Home.hm2_w_ibmapsize+1) * (512 / ctx->sector_size),
+                  (uint8 *)&Header, &sects_read, sizeof (Header) / ctx->sector_size, physsectsz)) ||
     (sects_read != (sizeof (Header) / ctx->sector_size)))
     goto Return_Cleanup;
 CheckSum1 = ODSChecksum (&Header, 255);
 if (CheckSum1 != *(((uint16 *)&Header)+255)) /* Verify Checksum on BITMAP.SYS file header */
     goto Return_Cleanup;
 Retr = (ODS2_Retreval *)(((uint16*)(&Header))+Header.fh2_b_mpoffset);
-/* The BitMap File has a single extent, which may be preceeded by a placement descriptor */
+/* The BitMap File has a single extent, which may be preceded by a placement descriptor */
 if (Retr->fm2_r_word0_bits.fm2_v_format == 0)
     Retr = (ODS2_Retreval *)(((uint16 *)Retr)+1); /* skip placement descriptor */
 switch (Retr->fm2_r_word0_bits.fm2_v_format)
@@ -1324,12 +1324,12 @@ if ((_DEC_rdsect (uptr, ScbLbn * (512 / ctx->sector_size), (uint8 *)&Scb, &sects
 CheckSum1 = ODSChecksum (&Scb, 255);
 if (CheckSum1 != *(((uint16 *)&Scb)+255)) /* Verify Checksum on Storage Control Block */
     goto Return_Cleanup;
-if ((Scb.scb_w_cluster != Home.hm2_w_cluster) || 
+if ((Scb.scb_w_cluster != Home.hm2_w_cluster) ||
     (Scb.scb_b_strucver != Home.hm2_b_strucver) ||
     (Scb.scb_b_struclev != Home.hm2_b_struclev))
     goto Return_Cleanup;
 sim_messagef (SCPE_OK, "%s: '%s' Contains ODS%d File system\n", sim_uname (uptr), uptr->filename, Home.hm2_b_struclev);
-sim_messagef (SCPE_OK, "%s: Volume Name: %12.12s Format: %12.12s Sectors In Volume: %u\n", 
+sim_messagef (SCPE_OK, "%s: Volume Name: %12.12s Format: %12.12s Sectors In Volume: %u\n",
                                    sim_uname (uptr), Home.hm2_t_volname, Home.hm2_t_format, Scb.scb_l_volsize);
 ret_val = ((t_offset)Scb.scb_l_volsize) * 512;
 
@@ -1365,12 +1365,12 @@ if ((_DEC_rdsect (uptr, 512 / ctx->sector_size, (uint8 *)&Home, &sects_read, siz
     goto Return_Cleanup;
 CheckSum1 = ODSChecksum (&Home, (uint16)((((char *)&Home.hm1_w_checksum1)-((char *)&Home.hm1_w_ibmapsize))/2));
 CheckSum2 = ODSChecksum (&Home, (uint16)((((char *)&Home.hm1_w_checksum2)-((char *)&Home.hm1_w_ibmapsize))/2));
-if ((Home.hm1_w_ibmapsize == 0) || 
-    (Home.hm1_l_ibmaplbn == 0) || 
-    (Home.hm1_w_maxfiles == 0) || 
-    (Home.hm1_w_cluster != 1) || 
-    ((Home.hm1_w_structlev != HM1_C_LEVEL1) && (Home.hm1_w_structlev != HM1_C_LEVEL2)) || 
-    (Home.hm1_l_ibmaplbn == 0) || 
+if ((Home.hm1_w_ibmapsize == 0) ||
+    (Home.hm1_l_ibmaplbn == 0) ||
+    (Home.hm1_w_maxfiles == 0) ||
+    (Home.hm1_w_cluster != 1) ||
+    ((Home.hm1_w_structlev != HM1_C_LEVEL1) && (Home.hm1_w_structlev != HM1_C_LEVEL2)) ||
+    (Home.hm1_l_ibmaplbn == 0) ||
     (Home.hm1_w_checksum1 != CheckSum1) ||
     (Home.hm1_w_checksum2 != CheckSum2))
     goto Return_Cleanup;
@@ -1392,7 +1392,7 @@ if (Scb->scb_b_bitmapblks < 127)
 else
     ret_val = (((t_offset)Scb->scb_r_blocks[0].scb_w_freeblks << 16) + Scb->scb_r_blocks[0].scb_w_freeptr) * 512;
 sim_messagef (SCPE_OK, "%s: '%s' Contains an ODS1 File system\n", sim_uname (uptr), uptr->filename);
-sim_messagef (SCPE_OK, "%s: Volume Name: %12.12s Format: %12.12s Sectors In Volume: %u\n", 
+sim_messagef (SCPE_OK, "%s: Volume Name: %12.12s Format: %12.12s Sectors In Volume: %u\n",
                                 sim_uname (uptr), Home.hm1_t_volname, Home.hm1_t_format, (uint32)(ret_val / 512));
 Return_Cleanup:
 uptr->capac = saved_capac;
@@ -1434,7 +1434,7 @@ if ((_DEC_rdsect (uptr, 31 * (512 / ctx->sector_size), sector_buf, &sects_read,
     (sects_read != (512 / ctx->sector_size)))
     goto Return_Cleanup;
 
-if ((Label->pt_magic != PT_MAGIC) || 
+if ((Label->pt_magic != PT_MAGIC) ||
     (Label->pt_valid != PT_VALID))
     goto Return_Cleanup;
 
@@ -1524,7 +1524,7 @@ saved_capac = uptr->capac;
 uptr->capac = temp_capac;
 
 while (sim_disk_rdsect(uptr, (t_lba)(sectfactor * cur_pos / sizeof (*Desc)), (uint8 *)Desc, &sectsread, sectfactor) == DKSE_OK) {
-    if ((sectsread != sectfactor)               || 
+    if ((sectsread != sectfactor)               ||
         (Desc->Version != 1)                    ||
         (0 != memcmp (Desc->Identifier, "CD001", sizeof (Desc->Identifier))))
         break;
@@ -2027,7 +2027,7 @@ for (context.dcshift = 0; context.dcshift < 8; context.dcshift++) {
                                 }
 
                             sim_messagef(SCPE_OK, "%s: '%s' Contains a RSTS File system\n", sim_uname (uptr), uptr->filename);
-                            sim_messagef(SCPE_OK, "%s: Pack ID: %6.6s Revision Level: %3s Pack Clustersize: %d\n", 
+                            sim_messagef(SCPE_OK, "%s: Pack ID: %6.6s Revision Level: %3s Pack Clustersize: %d\n",
                                                                   sim_uname (uptr), context.packid, fmt, context.pcs);
                             sim_messagef(SCPE_OK, "%s: Last Unallocated Sector In File System: %u\n", sim_uname (uptr), (uint32)((ret_val / 512) - 1));
                             goto cleanup_done;
@@ -2120,7 +2120,7 @@ if (strncmp((char *)&home->hb_b_sysid, HB_C_SYSID, strlen(HB_C_SYSID)) == 0) {
 
 if (strncmp((char *)&home->hb_b_sysid, HB_C_VMSSYSID, strlen(HB_C_VMSSYSID)) == 0)
     return RT11_SINGLEPART;
- 
+
 return RT11_NOPART;
 }
 
@@ -2156,7 +2156,7 @@ for (part = 0; part < RT11_MAXPARTITIONS; part++) {
      */
     if ((part != 0) && (physsectsz != 0))
       break;
-    
+
     base = part << 16;
 
     if (_DEC_rdsect(uptr, (base + RT11_HOME) * (512 / ctx->sector_size), (uint8 *)&Home, &sects_read, 512 / ctx->sector_size, physsectsz) ||
@@ -2293,22 +2293,22 @@ for (i = 0; checks[i] != NULL; i++)
     if ((ret_val = checks[i] (uptr, 0, readonly)) != (t_offset)-1) {
         /* ISO files that haven't already been determined to be ISO 9660
          * which contain a known file system are also marked read-only
-         * now.  This fits early DEC distribution CDs that were created 
+         * now.  This fits early DEC distribution CDs that were created
          * before ISO 9660 was standardized and operating support was added.
          */
-        if ((readonly != NULL)          && 
+        if ((readonly != NULL)          &&
             (*readonly == FALSE)        &&
             (NULL != match_ext (uptr->filename, "ISO")))
             *readonly = TRUE;
         return ret_val;
         }
-/* 
- * The only known interleaved disk devices have either 256 byte 
- * or 128 byte sector sizes.  If additional interleaved file 
+/*
+ * The only known interleaved disk devices have either 256 byte
+ * or 128 byte sector sizes.  If additional interleaved file
  * system scenarios with different sector sizes come up they
  * should be added here.
  */
-   
+
 for (i = 0; checks[i] != NULL; i++) {
     ctx->sector_size = 256;
     if ((ret_val = checks[i] (uptr, ctx->sector_size, readonly)) != (t_offset)-1)
@@ -2318,7 +2318,7 @@ for (i = 0; checks[i] != NULL; i++) {
         break;
     }
 if ((ret_val != (t_offset)-1) && (ctx->sector_size != saved_sector_size ))
-    sim_messagef (SCPE_OK, "%s: with an unexpected sector size of %u bytes instead of %u bytes\n", 
+    sim_messagef (SCPE_OK, "%s: with an unexpected sector size of %u bytes instead of %u bytes\n",
                            sim_uname (uptr), ctx->sector_size, saved_sector_size);
 ctx->sector_size = saved_sector_size;
 return ret_val;
@@ -2395,7 +2395,7 @@ if (f) {
         }
     else {
         /* We've got a valid footer, but it may need to be corrected */
-        if ((NtoHl (f->TransferElementSize) == 1) && 
+        if ((NtoHl (f->TransferElementSize) == 1) &&
             (0 == memcmp (f->DriveType, "RZ", 2))) {
             f->TransferElementSize = NtoHl (2);
             f->Checksum = NtoHl (eth_crc32 (0, f, sizeof (*f) - sizeof (f->Checksum)));
@@ -2415,12 +2415,12 @@ if (f) {
             "   AccessFormat:        %u\n"
             "   CreationTime:        %s",
             sim_uname (uptr), uptr->filename,
-            f->CreatingSimulator, f->DriveType, NtoHl(f->SectorSize), NtoHl (f->SectorCount), 
+            f->CreatingSimulator, f->DriveType, NtoHl(f->SectorSize), NtoHl (f->SectorCount),
             NtoHl (f->TransferElementSize), f->FooterVersion, f->AccessFormat, f->CreationTime);
         if (f->DeviceName[0] != '\0')
-            sim_debug_unit (ctx->dbit, uptr, 
+            sim_debug_unit (ctx->dbit, uptr,
                 "   DeviceName:          %s\n", (char *)f->DeviceName);
-        sim_debug_unit (ctx->dbit, uptr, 
+        sim_debug_unit (ctx->dbit, uptr,
             "   HighwaterSector:     %u\n", (uint32)(ctx->highwater/ctx->sector_size));
         }
     }
@@ -2677,7 +2677,7 @@ if (sim_switches & SWMASK ('C')) {                      /* create new disk conta
             }
         sim_messagef (SCPE_OK, "Copying %u sectors each %u bytes in size\n", (uint32)total_sectors, (uint32)sector_size);
         if (source_capac > target_capac) {
-            sim_messagef (SCPE_OK, "The source container is %u sectors larger than the destination disk container\n", 
+            sim_messagef (SCPE_OK, "The source container is %u sectors larger than the destination disk container\n",
                         (t_lba)(((source_capac - target_capac)*capac_factor)/(sector_size/((dptr->flags & DEV_SECTORS) ? 512 : 1))));
             sim_messagef (SCPE_OK, "these additional sectors will be unavailable on the target drive\n");
             }
@@ -2739,7 +2739,7 @@ if (sim_switches & SWMASK ('C')) {                      /* create new disk conta
                     uptr->fileref = save_unit_fileref;
                     uptr->flags = saved_unit_flags;
                     if (r == SCPE_OK) {
-                        if ((sects_read != verify_read) || 
+                        if ((sects_read != verify_read) ||
                             (0 != memcmp (copy_buf, verify_buf, verify_read*sector_size)))
                             r = SCPE_IOERR;
                         }
@@ -2967,7 +2967,7 @@ if ((DK_GET_FMT (uptr) == DKUF_F_VHD) || (ctx->footer)) {
                 if ((container_sector_size != 0) && (sector_size != container_sector_size))
                     r = sim_messagef (SCPE_OPENERR, "%s: Incompatible Container Sector Size %d\n", sim_uname (uptr), container_sector_size);
                 else {
-                    if (dontchangecapac && 
+                    if (dontchangecapac &&
                         ((((t_lba)(ctx->container_size/sector_size) > current_unit_sectors)) ||
                          ((container_sectors != 0) && (container_sectors != current_unit_sectors)))) {
                          r = sim_messagef (SCPE_OK, "%s: Container has %u sectors, drive has: %u sectors\n", sim_uname (uptr), container_sectors, current_unit_sectors);
@@ -3034,7 +3034,7 @@ if ((created) && (!copied)) {
         t_lba lba;
         t_lba total_lbas = (t_lba)((((t_offset)uptr->capac)*ctx->capac_factor*((dptr->flags & DEV_SECTORS) ? 512 : 1))/ctx->sector_size);
 
-        for (lba = 0; (r == SCPE_OK) && (lba < total_lbas); lba += 128) { 
+        for (lba = 0; (r == SCPE_OK) && (lba < total_lbas); lba += 128) {
             t_seccnt sectors = ((lba + 128) <= total_lbas) ? 128 : total_lbas - lba;
 
             r = sim_disk_wrsect (uptr, lba, secbuf, NULL, sectors);
@@ -3077,7 +3077,7 @@ if ((created) && (!copied)) {
                 free (init_buf);
                 sim_disk_detach (uptr);                         /* report error now */
                 (void)remove (cptr);                            /* remove the created file */
-                return sim_messagef (SCPE_OPENERR, "Error initializing each sector with its address: %s\n", 
+                return sim_messagef (SCPE_OPENERR, "Error initializing each sector with its address: %s\n",
                                                    (r == SCPE_OK) ? sim_error_text (r) : "sectors written not what was requested");
                 }
             sim_messagef (SCPE_OK, "%s: Initialized To Sector Address %u/%u sectors.  %d%% complete.\r", sim_uname (uptr), (uint32)(lba + sects_written), (uint32)total_sectors, (int)((((float)lba)*100)/total_sectors));
@@ -3109,7 +3109,7 @@ if (sim_switches & SWMASK ('K')) {
         r = sim_disk_rdsect (uptr, lba, verify_buf, &sects_verify, sects);
         if (r == SCPE_OK) {
             if (sects != sects_verify)
-                sim_printf ("\n%s: Verification Error when reading lbn %d(0x%X) of %d(0x%X) Requested %u sectors, read %u sectors.\n", 
+                sim_printf ("\n%s: Verification Error when reading lbn %d(0x%X) of %d(0x%X) Requested %u sectors, read %u sectors.\n",
                             sim_uname (uptr), (int)lba, (int)lba, (int)total_sectors, (int)total_sectors, sects, sects_verify);
             for (sect = 0; sect < sects_verify; sect++) {
                 t_lba offset;
@@ -3181,7 +3181,7 @@ if (container_size && (container_size != (t_offset)-1)) {
                 uptr->capac = (t_addr)(filesystem_size/(ctx->capac_factor*((dptr->flags & DEV_SECTORS) ? ctx->sector_size : 1)));
                 capac1 = strdup (sprint_capac (dptr, uptr));
                 uptr->capac = saved_capac;
-                r = sim_messagef (r, "%s: The file system on the disk %s is larger than simulated device (%s > %s)\n", 
+                r = sim_messagef (r, "%s: The file system on the disk %s is larger than simulated device (%s > %s)\n",
                                     sim_uname (uptr), cptr, capac1, sprint_capac (dptr, uptr));
                 free (capac1);
                 sim_disk_detach (uptr);
@@ -3200,7 +3200,7 @@ if (container_size && (container_size != (t_offset)-1)) {
                         uptr->capac = (t_addr)(container_size/(ctx->capac_factor*((dptr->flags & DEV_SECTORS) ? ctx->sector_size : 1)));
                         capac1 = strdup (sprint_capac (dptr, uptr));
                         uptr->capac = saved_capac;
-                        r = sim_messagef (r, "%s: The disk container '%s' is larger than simulated device (%s > %s)\n", 
+                        r = sim_messagef (r, "%s: The disk container '%s' is larger than simulated device (%s > %s)\n",
                                             sim_uname (uptr), cptr, capac1, sprint_capac (dptr, uptr));
                         free (capac1);
                         sim_disk_detach (uptr);
@@ -3217,7 +3217,7 @@ if (container_size && (container_size != (t_offset)-1)) {
                 uptr->capac = (t_addr)(filesystem_size/(ctx->capac_factor*((dptr->flags & DEV_SECTORS) ? ctx->sector_size : 1)));
                 capac1 = strdup (sprint_capac (dptr, uptr));
                 uptr->capac = saved_capac;
-                r = sim_messagef (r, "%s: The file system on the %s disk container is larger than simulated device (%s > %s)\n", 
+                r = sim_messagef (r, "%s: The file system on the %s disk container is larger than simulated device (%s > %s)\n",
                                     sim_uname (uptr), cptr, capac1, sprint_capac (dptr, uptr));
                 free (capac1);
                 sim_disk_detach (uptr);
@@ -3236,7 +3236,7 @@ if (container_size && (container_size != (t_offset)-1)) {
                     uptr->capac = (t_addr)(container_size/(ctx->capac_factor*((dptr->flags & DEV_SECTORS) ? ctx->sector_size : 1)));
                     capac1 = strdup (sprint_capac (dptr, uptr));
                     uptr->capac = saved_capac;
-                    r = sim_messagef (r, "%s: non expandable %s%sdisk container '%s' is smaller than simulated device (%s < %s)\n", 
+                    r = sim_messagef (r, "%s: non expandable %s%sdisk container '%s' is smaller than simulated device (%s < %s)\n",
                                         sim_uname (uptr), container_dtype, (*container_dtype != '\0') ? " " : "", cptr, capac1, sprint_capac (dptr, uptr));
                     free (capac1);
                     sim_disk_detach (uptr);
@@ -3259,8 +3259,8 @@ if (container_size && (container_size != (t_offset)-1)) {
                     container_dtype = ctx->footer ? (const char *)ctx->footer->DriveType : "";
                     sim_switches = saved_switches;
                     if (r == SCPE_OK)
-                        r = sim_messagef (SCPE_OK, "%s: %s%sdisk container '%s' is larger than simulated device (%s > %s) Read Only Forced\n", 
-                                sim_uname (uptr), container_dtype, (*container_dtype != '\0') ? " " : "", cptr, 
+                        r = sim_messagef (SCPE_OK, "%s: %s%sdisk container '%s' is larger than simulated device (%s > %s) Read Only Forced\n",
+                                sim_uname (uptr), container_dtype, (*container_dtype != '\0') ? " " : "", cptr,
                                 capac1, sprint_capac (dptr, uptr));
                     free (capac1);
                     return r;
@@ -3317,9 +3317,9 @@ if (uptr->flags & UNIT_BUFABLE) {                       /* buffer in memory? */
     t_stat r = SCPE_OK;
 
     if (uptr->flags & UNIT_MUSTBUF) {                   /* dyn alloc? */
-        uptr->filebuf = calloc ((size_t)(ctx->container_size / ctx->xfer_element_size), 
+        uptr->filebuf = calloc ((size_t)(ctx->container_size / ctx->xfer_element_size),
                                     ctx->xfer_element_size);       /* allocate */
-        uptr->filebuf2 = calloc ((size_t)(ctx->container_size / ctx->xfer_element_size), 
+        uptr->filebuf2 = calloc ((size_t)(ctx->container_size / ctx->xfer_element_size),
                                     ctx->xfer_element_size);       /* allocate copy */
         if ((uptr->filebuf == NULL) ||                  /* either failed? */
             (uptr->filebuf2 == NULL)) {
@@ -3379,7 +3379,7 @@ if (NULL == find_dev_from_unit (uptr))
 if ((uptr->flags & UNIT_BUF) && (uptr->filebuf)) {
     uint32 cap = (uptr->hwmark + uptr->dptr->aincr - 1) / uptr->dptr->aincr;
 
-    if (((uptr->flags & UNIT_RO) == 0) && 
+    if (((uptr->flags & UNIT_RO) == 0) &&
         (memcmp (uptr->filebuf, uptr->filebuf2, (size_t)ctx->container_size) != 0)) {
         sim_messagef (SCPE_OK, "%s: writing buffer to file: %s\n", sim_uname (uptr), uptr->filename);
         sim_disk_wrsect (uptr, 0, (uint8 *)uptr->filebuf, NULL, (cap + ctx->sector_size - 1) / ctx->sector_size);
@@ -3667,9 +3667,9 @@ return SCPE_OK;
 /* Factory bad block table creation routine
 
    This routine writes a DEC standard 144 compliant bad block table on the
-   last track of the specified unit as described in: 
+   last track of the specified unit as described in:
       EL-00144_B_DEC_STD_144_Disk_Standard_for_Recording_and_Handling_Bad_Sectors_Nov76.pdf
-   The bad block table consists of 10 repetitions of the same table, 
+   The bad block table consists of 10 repetitions of the same table,
    formatted as follows:
 
         words 0-1       pack id number
@@ -3948,9 +3948,9 @@ if (strchr (openmode, 'r'))
     DesiredAccess |= GENERIC_READ;
 if (strchr (openmode, 'w') || strchr (openmode, '+'))
     DesiredAccess |= GENERIC_WRITE;
-/* SCP Command Line parsing replaces \\ with \ presuming this is an 
-   escape sequence.  This only affecdts RAW device names and UNC paths.
-   We handle the RAW device name case here by prepending paths beginning 
+/* SCP Command Line parsing replaces \\ with \ presuming this is an
+   escape sequence.  This only affects RAW device names and UNC paths.
+   We handle the RAW device name case here by prepending paths beginning
    with \.\ with an extra \. */
 if ((!memcmp ("\\.\\", rawdevicename, 3)) ||
     (!memcmp ("/./", rawdevicename, 3))) {
@@ -3962,7 +3962,7 @@ else
 Handle = CreateFileA (tmpname, DesiredAccess, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS|FILE_FLAG_WRITE_THROUGH, NULL);
 free (tmpname);
 if (Handle != INVALID_HANDLE_VALUE) {
-    if ((sim_os_disk_info_raw ((FILE *)Handle, NULL, NULL, &is_cdrom)) || 
+    if ((sim_os_disk_info_raw ((FILE *)Handle, NULL, NULL, &is_cdrom)) ||
         ((DesiredAccess & GENERIC_WRITE) && is_cdrom)) {
         CloseHandle (Handle);
         errno = EACCES;
@@ -5411,7 +5411,7 @@ static FILE *sim_vhd_disk_open (const char *szVHDPath, const char *DesiredAccess
                                0);
         if (Status)
             goto Cleanup_Return;
-        if ((0 != memcmp (hVHD->Dynamic.ParentUniqueID, ParentFooter.UniqueID, sizeof (ParentFooter.UniqueID))) || 
+        if ((0 != memcmp (hVHD->Dynamic.ParentUniqueID, ParentFooter.UniqueID, sizeof (ParentFooter.UniqueID))) ||
             (ParentModifiedTimeStamp != hVHD->Dynamic.ParentTimeStamp)) {
             if (sim_switches & SWMASK ('O')) {                      /* OVERRIDE consistency checks? */
                 if ((sim_switches & SWMASK ('U')) &&                /* FIX (UPDATE) consistency checks AND */
@@ -6161,7 +6161,7 @@ if (NtoHl (hVHD->Footer.DiskType) == VHD_DT_Fixed) {
     }
 /* We are now dealing with a Dynamically expanding or differencing disk */
 DynamicBlockSize = NtoHl (hVHD->Dynamic.BlockSize);
-if ((DynamicBlockSize == 0) || 
+if ((DynamicBlockSize == 0) ||
     ((DynamicBlockSize & (DynamicBlockSize - 1)) != 0)) {
     errno = ERANGE;
     return SCPE_IOERR;
@@ -6292,7 +6292,7 @@ if (NtoHl(hVHD->Footer.DiskType) == VHD_DT_Fixed) {
     }
 /* We are now dealing with a Dynamically expanding or differencing disk */
 DynamicBlockSize = NtoHl (hVHD->Dynamic.BlockSize);
-if ((DynamicBlockSize == 0) || 
+if ((DynamicBlockSize == 0) ||
     ((DynamicBlockSize & (DynamicBlockSize - 1)) != 0)) {
     errno = ERANGE;
     return SCPE_IOERR;
@@ -6381,9 +6381,9 @@ while (BytesToWrite && (r == SCPE_OK)) {
             goto Fatal_IO_Error;
         /* Since a large VHD can have a pretty large BAT, and we've only changed one longword bat entry
            in the current BAT, we write just the aligned sector which contains the updated BAT entry */
-        BATUpdateBufferAddress = (uint8 *)hVHD->BAT - (size_t)NtoHll(hVHD->Dynamic.TableOffset) + 
+        BATUpdateBufferAddress = (uint8 *)hVHD->BAT - (size_t)NtoHll(hVHD->Dynamic.TableOffset) +
             (size_t)((((size_t)&hVHD->BAT[BlockNumber]) - (size_t)hVHD->BAT + (size_t)NtoHll(hVHD->Dynamic.TableOffset)) & ~(VHD_DATA_BLOCK_ALIGNMENT-1));
-        /* If the starting of the BAT isn't on a VHD_DATA_BLOCK_ALIGNMENT boundary and we've just updated 
+        /* If the starting of the BAT isn't on a VHD_DATA_BLOCK_ALIGNMENT boundary and we've just updated
            a BAT entry early in the array, the buffer computed address might be before the start of the
            BAT table.  If so, only write the BAT data needed */
         if (BATUpdateBufferAddress < (uint8 *)hVHD->BAT) {
@@ -6537,7 +6537,7 @@ for (i = 0; (dptr = sim_devices[i]) != NULL; i++) {     /* loop thru dev */
                 return TRUE;                            /* can't stat assume attached */
                 }
             free (fullpath);
-            if ((statb.st_dev   != filestat.st_dev)   || 
+            if ((statb.st_dev   != filestat.st_dev)   ||
                 (statb.st_ino   != filestat.st_ino)   ||
                 (statb.st_mode  != filestat.st_mode)  ||
                 (statb.st_nlink != filestat.st_nlink) ||
@@ -6556,7 +6556,7 @@ free (fullname);
 return FALSE;                                           /* Not attached */
 }
 
-static void sim_disk_info_entry (const char *directory, 
+static void sim_disk_info_entry (const char *directory,
                                  const char *filename,
                                  t_offset FileSize,
                                  const struct stat *filestat,
@@ -6597,14 +6597,14 @@ if (info->flag) {        /* zap type */
     if ((container_size != (t_offset)-1) && (container_size > (t_offset)sizeof (*f)) &&
         (sim_fseeko (container, container_size - sizeof (*f), SEEK_SET) == 0) &&
         (sizeof (*f) == sim_fread (f, 1, sizeof (*f), container))) {
-        if ((memcmp (f->Signature, "simh", 4) == 0) && 
+        if ((memcmp (f->Signature, "simh", 4) == 0) &&
             (f->Checksum == NtoHl (eth_crc32 (0, f, sizeof (*f) - sizeof (f->Checksum))))) {
             uint8 *sector_data;
             uint8 *zero_sector;
             size_t sector_size = NtoHl (f->SectorSize);
             t_offset highwater = (((t_offset)NtoHl (f->Highwater[0])) << 32) | ((t_offset)NtoHl (f->Highwater[1]));
 
-            if (sector_size > 16384)        /* arbitray upper limit */
+            if (sector_size > 16384)        /* arbitrary upper limit */
                 sector_size = 16384;
             /* determine whole sectors in original container size */
             /* By default we chop off the disk footer and trailing */
@@ -6686,7 +6686,7 @@ if (info->flag == 0) {
                         "   AccessFormat:        %s\n"
                         "   CreationTime:        %s",
                         uptr->filename,
-                        f->CreatingSimulator, f->DriveType, NtoHl(f->SectorSize), NtoHl (f->SectorCount), 
+                        f->CreatingSimulator, f->DriveType, NtoHl(f->SectorSize), NtoHl (f->SectorCount),
                         NtoHl (f->TransferElementSize), fmts[f->AccessFormat].name, f->CreationTime);
             if (f->DeviceName[0] != '\0')
                 sim_printf ("   DeviceName:          %s\n", (char *)f->DeviceName);
@@ -6824,7 +6824,7 @@ if (!(uptr->flags & UNIT_RO)) { /* Only test drives open Read/Write - Read Only
 
                 for (i = 0; i < uint32s_per_sector; i++)
                     if (c->data[i + sector_to_check * uint32s_per_sector] != (lba + sector_to_check)) {
-                        sim_printf ("Sector %u(0x%X) has unexpected data at offset 0x%X: 0x%08X\n", 
+                        sim_printf ("Sector %u(0x%X) has unexpected data at offset 0x%X: 0x%08X\n",
                                     lba + sector_to_check, lba + sector_to_check, i, c->data[i + sector_to_check * uint32s_per_sector]);
                         unexpected_data = TRUE;
                         break;
diff --git a/sim_disk.h b/sim_disk.h
index 25ed588..90d26e1 100644
--- a/sim_disk.h
+++ b/sim_disk.h
@@ -19,12 +19,12 @@
    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-   Except as contained in this notice, the names of Robert M Supnik and 
+   Except as contained in this notice, the names of Robert M Supnik and
    Mark Pizzolato shall not be used in advertising or otherwise to promote
-   the sale, use or other dealings in this Software without prior written 
+   the sale, use or other dealings in this Software without prior written
    authorization from Robert M Supnik and Mark Pizzolato.
 
-   25-Jan-11    MP      Initial Implemementation
+   25-Jan-11    MP      Initial Implementation
 */
 
 #ifndef SIM_DISK_H_
@@ -70,19 +70,19 @@ typedef void (*DISK_PCALLBACK)(UNIT *unit, t_stat status);
 /* Prototypes */
 
 t_stat sim_disk_init (void);
-t_stat sim_disk_attach (UNIT *uptr, 
-                        const char *cptr, 
+t_stat sim_disk_attach (UNIT *uptr,
+                        const char *cptr,
                         size_t memory_sector_size,  /* memory footprint of sector data */
-                        size_t xfer_element_size, 
+                        size_t xfer_element_size,
                         t_bool dontchangecapac,     /* if false just change uptr->capac as needed */
                         uint32 debugbit,            /* debug bit */
                         const char *drivetype,      /* drive type */
                         uint32 pdp11_tracksize,     /* BAD144 track */
                         int completion_delay);      /* Minimum Delay for asynch I/O completion */
-t_stat sim_disk_attach_ex (UNIT *uptr, 
-                           const char *cptr, 
+t_stat sim_disk_attach_ex (UNIT *uptr,
+                           const char *cptr,
                            size_t memory_sector_size,   /* memory footprint of sector data */
-                           size_t xfer_element_size, 
+                           size_t xfer_element_size,
                            t_bool dontchangecapac,      /* if false just change uptr->capac as needed */
                            uint32 dbit,                 /* debug bit */
                            const char *dtype,           /* drive type */
@@ -90,10 +90,10 @@ t_stat sim_disk_attach_ex (UNIT *uptr,
                            int completion_delay,        /* Minimum Delay for asynch I/O completion */
                            const char **drivetypes);    /* list of drive types (from smallest to largest) */
                                                         /* to try and fit the container/file system into */
-t_stat sim_disk_attach_ex2 (UNIT *uptr, 
-                            const char *cptr, 
+t_stat sim_disk_attach_ex2 (UNIT *uptr,
+                            const char *cptr,
                             size_t memory_sector_size,  /* memory footprint of sector data */
-                            size_t xfer_element_size, 
+                            size_t xfer_element_size,
                             t_bool dontchangecapac,     /* if false just change uptr->capac as needed */
                             uint32 dbit,                /* debug bit */
                             const char *dtype,          /* drive type */
diff --git a/sim_ether.c b/sim_ether.c
index e1013bc..7faabbd 100644
--- a/sim_ether.c
+++ b/sim_ether.c
@@ -66,27 +66,27 @@
   HP/UX                     ??
   Compaq Tru64 Unix         ??
   VMS                       Alpha/Itanium VMS only, needs VMS libpcap
-  
-  WinPcap is no longer developed or supported by was available from: 
+
+  WinPcap is no longer developed or supported by was available from:
                         http://winpcap.polito.it/
   Npcap is a complete replacement for systems running Windows7 and later
   and is available from:
                         https://nmap.org/npcap
-  libpcap for VMS is available from: 
+  libpcap for VMS is available from:
                         http://simh.trailing-edge.com/sources/vms-pcap.zip
-  libpcap for other Unix platforms is available at: 
-        NOTE: As of the release of this version of sim_ether.c ALL current 
-              *nix platforms ship with a sufficiently new version of 
+  libpcap for other Unix platforms is available at:
+        NOTE: As of the release of this version of sim_ether.c ALL current
+              *nix platforms ship with a sufficiently new version of
               libpcap, and ALL provide a libpcap-dev package for developing
               libpcap based applications.  The OS vendor supplied version
               of libpcap AND the libpcap-dev components are preferred for
-              proper operation of both simh AND other applications on the 
+              proper operation of both simh AND other applications on the
               host system which use libpcap.
         Current Version:  http://www.tcpdump.org/daily/libpcap-current.tar.gz
         Released Version: http://www.tcpdump.org/release/
 
-        When absolutely necessary (see NOTE above about vendor supplied 
-        libpcap), we've gotten the tarball, unpacked, built and installed 
+        When absolutely necessary (see NOTE above about vendor supplied
+        libpcap), we've gotten the tarball, unpacked, built and installed
         it with:
             gzip -dc libpcap-current.tar.gz | tar xvf -
             cd libpcap-directory-name
@@ -95,74 +95,74 @@
             make install
         Note:  The "make install" step generally will have to be done as root.
         This will install libpcap in /usr/local/lib and /usr/local/include
-        The current simh makefile will do the right thing to locate and 
+        The current simh makefile will do the right thing to locate and
         reference the OS provided libpcap or the one just installed.
 
 
-  Note: Building for the platforms indicated above, with the indicated libpcap, 
-  should automatically leverage the appropriate mechanisms contained here.  
-  Things are structured so that it is likely to work for any other as yet 
-  untested platform.  If it works for you, please let the author know so we 
-  can update the table above.  If it doesn't work, then the following #define 
+  Note: Building for the platforms indicated above, with the indicated libpcap,
+  should automatically leverage the appropriate mechanisms contained here.
+  Things are structured so that it is likely to work for any other as yet
+  untested platform.  If it works for you, please let the author know so we
+  can update the table above.  If it doesn't work, then the following #define
   variables can influence the operation on an untested platform.
 
-  USE_BPF           - Determines if this code leverages a libpcap/WinPcap 
-                      provided bpf packet filtering facility.  All tested 
-                      environments have bpf facilities that work the way we 
-                      need them to.  However a new one might not.  undefine 
+  USE_BPF           - Determines if this code leverages a libpcap/WinPcap
+                      provided bpf packet filtering facility.  All tested
+                      environments have bpf facilities that work the way we
+                      need them to.  However a new one might not.  undefine
                       this variable to let this code do its own filtering.
-  USE_SETNONBLOCK   - Specifies whether the libpcap environment's non-blocking 
-                      semantics are to be leveraged.  This helps to manage the 
-                      varying behaviours of the kernel packet facilities 
+  USE_SETNONBLOCK   - Specifies whether the libpcap environment's non-blocking
+                      semantics are to be leveraged.  This helps to manage the
+                      varying behaviours of the kernel packet facilities
                       leveraged by libpcap.
-  USE_READER_THREAD - Specifies that packet reading should be done in the 
-                      context of a separate thread.  The Posix threading 
+  USE_READER_THREAD - Specifies that packet reading should be done in the
+                      context of a separate thread.  The Posix threading
                       APIs are used.  This option is less efficient than the
-                      default non-threaded approach, but it exists since some 
-                      platforms don't want to work with nonblocking libpcap 
-                      semantics.   OpenBSD and NetBSD either don't have pthread 
-                      APIs available, or they are too buggy to be useful. 
-                      Using the threaded approach may require special compile 
-                      and/or link time switches (i.e. -lpthread or -pthread, 
-                      etc.) Consult the documentation for your platform as 
+                      default non-threaded approach, but it exists since some
+                      platforms don't want to work with nonblocking libpcap
+                      semantics.   OpenBSD and NetBSD either don't have pthread
+                      APIs available, or they are too buggy to be useful.
+                      Using the threaded approach may require special compile
+                      and/or link time switches (i.e. -lpthread or -pthread,
+                      etc.) Consult the documentation for your platform as
                       needed.  Although this may be 'less efficient' than the
                       non-threaded approach, the efficiency is an overall system
-                      efficiency not necessarily a simulator efficiency.  This 
-                      means that work is removed from the thread executing 
+                      efficiency not necessarily a simulator efficiency.  This
+                      means that work is removed from the thread executing
                       simulated instructions so the simulated system will most
-                      likely run faster (given that modern host CPUs are 
+                      likely run faster (given that modern host CPUs are
                       multi-core and have someplace to do this work in parallel).
-  MUST_DO_SELECT    - Specifies that, when USE_READER_THREAD is active,  
-                      select() should be used to determine when available 
-                      packets are ready for reading.  Otherwise, we depend 
-                      on the libpcap/kernel packet timeout specified on 
-                      pcap_open_live.  If USE_READER_THREAD is not set, then 
+  MUST_DO_SELECT    - Specifies that, when USE_READER_THREAD is active,
+                      select() should be used to determine when available
+                      packets are ready for reading.  Otherwise, we depend
+                      on the libpcap/kernel packet timeout specified on
+                      pcap_open_live.  If USE_READER_THREAD is not set, then
                       MUST_DO_SELECT is irrelevant
-  HAVE_TAP_NETWORK  - Specifies that support for tap networking should be 
+  HAVE_TAP_NETWORK  - Specifies that support for tap networking should be
                       included.  This can be leveraged, along with OS bridging
-                      capabilities to share a single LAN interface.  This 
+                      capabilities to share a single LAN interface.  This
                       allows device names of the form tap:tap0 to be specified
-                      at open time.  This functionality is only useful/needed 
-                      on *nix platforms since native sharing of Windows NIC 
+                      at open time.  This functionality is only useful/needed
+                      on *nix platforms since native sharing of Windows NIC
                       devices works with no external magic.
-  HAVE_VDE_NETWORK  - Specifies that support for vde networking should be 
+  HAVE_VDE_NETWORK  - Specifies that support for vde networking should be
                       included.  This can be leveraged, along with OS bridging
                       capabilities to share a single LAN interface.  It also
-                      can allow a simulator to have useful networking 
-                      functionality when running without root access.  This 
-                      allows device names of the form vde:/tmp/switch to be 
-                      specified at open time.  This functionality is only 
-                      available on *nix platforms since the vde api isn't 
+                      can allow a simulator to have useful networking
+                      functionality when running without root access.  This
+                      allows device names of the form vde:/tmp/switch to be
+                      specified at open time.  This functionality is only
+                      available on *nix platforms since the vde api isn't
                       available on Windows.
-  HAVE_SLIRP_NETWORK- Specifies that support for SLiRP networking should be 
-                      included.  This can be leveraged to provide User Mode 
+  HAVE_SLIRP_NETWORK- Specifies that support for SLiRP networking should be
+                      included.  This can be leveraged to provide User Mode
                       IP NAT connectivity for simulators.
 
   NEED_PCAP_SENDPACKET
                     - Specifies that you are using an older version of libpcap
                       which doesn't provide a pcap_sendpacket API.
 
-  NOTE: Changing these defines is done in either sim_ether.h OR on the global 
+  NOTE: Changing these defines is done in either sim_ether.h OR on the global
         compiler command line which builds all of the modules included in a
         simulator.
 
@@ -171,9 +171,9 @@
   Modification history:
 
   30-Mar-12  MP   Added host NIC address determination on supported VMS platforms
-  01-Mar-12  MP   Made host NIC address determination on *nix platforms more 
+  01-Mar-12  MP   Made host NIC address determination on *nix platforms more
                   robust.
-  01-Mar-12  MP   Added host NIC address determination work when building 
+  01-Mar-12  MP   Added host NIC address determination work when building
                   under Cygwin
   01-Mar-12  AGN  Add conditionals for Cygwin dynamic loading of wpcap.dll
   01-Mar-12  AGN  Specify the full /usr/lib for dlopen under Apple Mac OS X.
@@ -181,78 +181,78 @@
   30-Oct-11  MP   Added support for vde (Virtual Distributed Ethernet) networking
   29-Oct-11  MP   Added support for integrated Tap networking interfaces on OSX
   12-Aug-11  MP   Cleaned up payload length determination
-                  Fixed race condition detecting reflections when threaded 
+                  Fixed race condition detecting reflections when threaded
                   reading and writing is enabled
-  18-Apr-11  MP   Fixed race condition with self loopback packets in 
+  18-Apr-11  MP   Fixed race condition with self loopback packets in
                   multithreaded environments
-  09-Jan-11  MP   Fixed missing crc data when USE_READER_THREAD is defined and 
+  09-Jan-11  MP   Fixed missing crc data when USE_READER_THREAD is defined and
                   crc's are needed (only the pdp11_xu)
-  16-Dec-10  MP   added priority boost for read and write threads when 
+  16-Dec-10  MP   added priority boost for read and write threads when
                   USE_READER_THREAD does I/O in separate threads.  This helps
-                  throughput since it allows these I/O bound threads to preempt 
-                  the main thread (which is executing simulated instructions).                  
+                  throughput since it allows these I/O bound threads to preempt
+                  the main thread (which is executing simulated instructions).
   09-Dec-10  MP   allowed more flexible parsing of MAC address strings
   09-Dec-10  MP   Added support to determine if network address conflicts exist
   07-Dec-10  MP   Reworked DECnet self detection to the more general approach
                   of loopback self when a Physical Address is being set.
-  04-Dec-10  MP   Changed eth_write to do nonblocking writes when 
+  04-Dec-10  MP   Changed eth_write to do nonblocking writes when
                   USE_READER_THREAD is defined.
   20-Aug-10  TVO  Fix for Mac OSX 10.6
   17-Jun-10  MP   Fixed bug in the AUTODIN II hash filtering.
-  14-Jun-10  MP   Added support for integrated Tap networking interfaces on BSD 
+  14-Jun-10  MP   Added support for integrated Tap networking interfaces on BSD
                   platforms.
-  13-Jun-10  MP   Added support for integrated Tap networking interfaces on Linux 
+  13-Jun-10  MP   Added support for integrated Tap networking interfaces on Linux
                   platforms.
   31-May-10  MP   Added support for more TOE (TCP Offload Engine) features for IPv4
                   network traffic from the host and/or from hosts on the LAN.  These
                   new TOE features are: LSO (Large Send Offload) and Jumbo packet
                   fragmentation support.  These features allow a simulated network
-                  device to support traffic when a host leverages a NIC's Large 
-                  Send Offload capabilities to fregment and/or segment outgoing 
-                  network traffic.  Additionally a simulated network device can 
+                  device to support traffic when a host leverages a NIC's Large
+                  Send Offload capabilities to fragment and/or segment outgoing
+                  network traffic.  Additionally a simulated network device can
                   reasonably exist on a LAN which is configured to use Jumbo frames.
-  21-May-10  MP   Added functionality to fixup IP header checksums to accomodate 
+  21-May-10  MP   Added functionality to fixup IP header checksums to accomodate
                   packets from a host with a NIC which has TOE (TCP Offload Engine)
                   enabled which is expected to implement the checksum computations
                   in hardware.  Since we catch packets before they arrive at the
                   NIC the expected checksum insertions haven't been performed yet.
-                  This processing is only done for packets sent from the hoat to 
-                  the guest we're supporting.  In general this will be a relatively 
+                  This processing is only done for packets sent from the host to
+                  the guest we're supporting.  In general this will be a relatively
                   small number of packets so it is done for all IP frame packets
-                  coming from the hoat to the guest.  In order to make the 
+                  coming from the host to the guest.  In order to make the
                   determination of packets specifically arriving from the host we
                   need to know the hardware MAC address of the host NIC.  Currently
                   determining a NIC's MAC address is relatively easy on Windows.
-                  The non-windows code works on linux and may work on other *nix 
-                  platforms either as is or with slight modifications.  The code, 
-                  as implemented, only messes with this activity if the host 
+                  The non-windows code works on linux and may work on other *nix
+                  platforms either as is or with slight modifications.  The code,
+                  as implemented, only messes with this activity if the host
                   interface MAC address can be determined.
-  20-May-10  MP   Added general support to deal with receiving packets smaller 
+  20-May-10  MP   Added general support to deal with receiving packets smaller
                   than ETH_MIN_PACKET in length.  These come from packets
                   looped back by some bridging mechanism and need to be padded
-                  to the minimum frame size.  A real NIC won't pass us any 
+                  to the minimum frame size.  A real NIC won't pass us any
                   packets like that.  This fix belongs here since this layer
-                  is responsible for interfacing to they physical layer 
+                  is responsible for interfacing to they physical layer
                   devices, AND it belongs here to get CRC processing right.
   05-Mar-08  MP   Added optional multicast filtering support for doing
                   LANCE style AUTODIN II based hashed filtering.
   07-Feb-08  MP   Added eth_show_dev to display ethernet state
                   Changed the return value from eth_read to return whether
-                  or not a packet was read.  No existing callers used or 
+                  or not a packet was read.  No existing callers used or
                   checked constant return value that previously was being
                   supplied.
-  29-Jan-08  MP   Added eth_set_async to provide a mechanism (when 
-                  USE_READER_THREAD is enabled) to allow packet reception 
-                  to dynamically update the simulator event queue and 
-                  potentially avoid polling for I/O.  This provides a minimal 
-                  overhead (no polling) maximal responsiveness for network 
+  29-Jan-08  MP   Added eth_set_async to provide a mechanism (when
+                  USE_READER_THREAD is enabled) to allow packet reception
+                  to dynamically update the simulator event queue and
+                  potentially avoid polling for I/O.  This provides a minimal
+                  overhead (no polling) maximal responsiveness for network
                   activities.
   29-Jan-08  MP   Properly sequenced activities in eth_close to avoid a race
                   condition when USE_READER_THREAD is enabled.
   25-Jan-08  MP   Changed the following when USE_READER_THREAD is enabled:
-                  - Fixed bug when the simulated device doesn't need crc 
+                  - Fixed bug when the simulated device doesn't need crc
                     in packet data which is read.
-                  - Added call to pcap_setmintocopy to minimize packet 
+                  - Added call to pcap_setmintocopy to minimize packet
                     delivery latencies.
                   - Added ethq_destroy and used it to avoid a memory leak in
                     eth_close.
@@ -262,8 +262,8 @@
                   Fixed the bpf filter used when no traffic is to be matched.
                   Reworked eth_add_packet_crc32 implementation to avoid an
                   extra buffer copy while reading packets.
-                  Fixedup #ifdef's relating to USE_SHARED so that setting 
-                  USE_SHARED or USE_NETWORK will build a working network 
+                  Fixedup #ifdef's relating to USE_SHARED so that setting
+                  USE_SHARED or USE_NETWORK will build a working network
                   environment.
   23-Jan-08  MP   Reworked eth_packet_trace and eth_packet_trace_ex to allow
                   only output ethernet header+crc and provide a mechanism for
@@ -286,10 +286,10 @@
   25-Mar-04  MP   Revised comments and minor #defines to deal with updated
                   libpcap which now provides pcap_sendpacket on all platforms.
   04-Feb-04  MP   Returned success/fail status from eth_write to support
-                  determining if the current libpcap connection can successfully 
+                  determining if the current libpcap connection can successfully
                   write packets.
                   Added threaded approach to reading packets since
-                  this works better on some platforms (solaris intel) than the 
+                  this works better on some platforms (solaris intel) than the
                   inconsistently implemented non-blocking read approach.
   04-Feb-04  DTH  Converted ETH_DEBUG to sim_debug
   13-Jan-04  MP   tested and fixed on OpenBSD, NetBS and FreeBSD.
@@ -323,7 +323,7 @@
                   work on Red Hat 6.2-sparc and Debian 3.0r1-sparc.
   03-Mar-03  MP   Changed logging to be consistent on stdout and sim_log
   01-Feb-03  MP   Changed type of local variables in eth_packet_trace to
-                  conform to the interface needs of eth_mac_fmt wich produces
+                  conform to the interface needs of eth_mac_fmt which produces
                   char data instead of unsigned char data.  Suggested by the
                   DECC compiler.
   15-Jan-03  DTH  Corrected PacketGetAdapterNames parameter2 datatype
@@ -364,7 +364,7 @@
   24-Sep-02  DTH  Finished eth_devices, eth_getname
   18-Sep-02  DTH  Callbacks implemented
   13-Sep-02  DTH  Basic packet read/write written
-  20-Aug-02  DTH  Created Sim_Ether for O/S independant ethernet implementation
+  20-Aug-02  DTH  Created Sim_Ether for O/S independent ethernet implementation
 
   ------------------------------------------------------------------------------
 */
@@ -388,7 +388,7 @@ static void eth_get_nic_hw_addr(ETH_DEV* dev, const char *devname, int set_on);
 static const unsigned char framer_oui[3] = { 0xaa, 0x00, 0x03 };
 
 /*============================================================================*/
-/*                  OS-independant ethernet routines                          */
+/*                  OS-independent ethernet routines                          */
 /*============================================================================*/
 
 t_stat eth_mac_scan (ETH_MAC* mac, const char* strmac)
@@ -459,7 +459,7 @@ t_stat eth_mac_scan_ex (ETH_MAC* mac, const char* strmac, UNIT *uptr)
       return sim_messagef (SCPE_ARG, "Invalid MAC address byte value: %02X\n", a[i]);
     else {
       uint32 mask, shift;
-    
+
       state.base_mac[i] = a[i];
       if (((i + 1) << 3) < state.bits)
           shift = 0;
@@ -945,7 +945,7 @@ t_stat eth_attach_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const cha
   fprintf (st, "This simulator was not built with ethernet device support\n");
   return SCPE_OK;
   }
-t_stat eth_check_address_conflict (ETH_DEV* dev, 
+t_stat eth_check_address_conflict (ETH_DEV* dev,
                                    ETH_MAC* const mac)
   {return SCPE_NOFNC;}
 t_stat eth_set_throttle (ETH_DEV* dev, uint32 time, uint32 burst, uint32 delay)
@@ -965,7 +965,7 @@ t_stat eth_filter_hash (ETH_DEV* dev, int addr_count, ETH_MAC* const addresses,
                    ETH_BOOL all_multicast, ETH_BOOL promiscuous, ETH_MULTIHASH* const hash)
   {return SCPE_NOFNC;}
 t_stat eth_filter_hash_ex(ETH_DEV* dev, int addr_count, ETH_MAC* const addresses,
-                          ETH_BOOL all_multicast, ETH_BOOL promiscuous, 
+                          ETH_BOOL all_multicast, ETH_BOOL promiscuous,
                           ETH_BOOL match_broadcast, ETH_MULTIHASH* const hash)
   {return SCPE_NOFNC;}
 const char *eth_version (void)
@@ -1033,8 +1033,8 @@ typedef void * pcap_t;  /* Pseudo Type to avoid compiler errors */
 #endif /* HAVE_PCAP_NETWORK */
 
 /*
-     The libpcap provided API pcap_findalldevs() on most platforms, will 
-     leverage the getifaddrs() API if it is available in preference to 
+     The libpcap provided API pcap_findalldevs() on most platforms, will
+     leverage the getifaddrs() API if it is available in preference to
      alternate platform specific methods of determining the interface list.
 
      A limitation of getifaddrs() is that it returns only interfaces which
@@ -1042,11 +1042,11 @@ typedef void * pcap_t;  /* Pseudo Type to avoid compiler errors */
      interfaces that we are interested in since a host may have dedicated
      interfaces for a simulator, which is otherwise unused by the host.
 
-     One could hand craft the the build of libpcap to specifically use 
-     alternate methods to implement pcap_findalldevs().  However, this can 
+     One could hand craft the the build of libpcap to specifically use
+     alternate methods to implement pcap_findalldevs().  However, this can
      get tricky, and would then result in a sort of deviant libpcap.
 
-     This routine exists to allow platform specific code to validate and/or 
+     This routine exists to allow platform specific code to validate and/or
      extend the set of available interfaces to include any that are not
      returned by pcap_findalldevs.
 
@@ -1098,7 +1098,7 @@ for (i=0; i<used; i++) {
       continue;
     reglen = sizeof(regval);
 
-    /* look for user-defined adapter name, bail if not found */  
+    /* look for user-defined adapter name, bail if not found */
     /* same comment about Windows XP x64 (above) using RegQueryValueEx */
     if ((status = RegQueryValueExA (reghnd, "Name", NULL, &regtype, regval, &reglen)) != ERROR_SUCCESS) {
       RegCloseKey (reghnd);
@@ -1210,9 +1210,9 @@ return used;
 
 #ifdef HAVE_TAP_NETWORK
 #if defined(__linux) || defined(__linux__)
-#include <sys/ioctl.h> 
-#include <net/if.h> 
-#include <linux/if_tun.h> 
+#include <sys/ioctl.h>
+#include <net/if.h>
+#include <linux/if_tun.h>
 #elif defined(HAVE_BSDTUNTAP)
 #include <sys/types.h>
 #include <net/if_types.h>
@@ -1577,9 +1577,9 @@ struct _PACKET_OID_DATA {
     uint32 Oid;                 ///< OID code. See the Microsoft DDK documentation or the file ntddndis.h
                                 ///< for a complete list of valid codes.
     uint32 Length;              ///< Length of the data field
-    uint8 Data[1];              ///< variable-lenght field that contains the information passed to or received 
+    uint8 Data[1];              ///< variable-length field that contains the information passed to or received
                                 ///< from the adapter.
-}; 
+};
 typedef struct _PACKET_OID_DATA PACKET_OID_DATA, *PPACKET_OID_DATA;
 typedef void **LPADAPTER;
 #define OID_802_3_CURRENT_ADDRESS               0x01010102 /* Extracted from ntddndis.h */
@@ -1611,7 +1611,7 @@ static int pcap_mac_if_win32(const char *AdapterName, unsigned char MACAddress[6
   p_PacketCloseAdapter = (void (*)(LPADAPTER lpAdapter))dlsym(hDll, "PacketCloseAdapter");
   p_PacketRequest = (int (*)(LPADAPTER  AdapterObject,BOOLEAN Set,PPACKET_OID_DATA  OidData))dlsym(hDll, "PacketRequest");
 #endif
-  
+
   /* Open the selected adapter */
 
   lpAdapter =   p_PacketOpenAdapter(AdapterName);
@@ -1625,7 +1625,7 @@ static int pcap_mac_if_win32(const char *AdapterName, unsigned char MACAddress[6
     return -1;
   }
 
-  /* Allocate a buffer to get the MAC adress */
+  /* Allocate a buffer to get the MAC address */
 
   OidData = (PACKET_OID_DATA *)malloc(6 + sizeof(PACKET_OID_DATA));
   if (OidData == NULL) {
@@ -1720,13 +1720,13 @@ static int pcap_mac_if_vms(const char *AdapterName, unsigned char MACAddress[6])
   Device.dsc$w_length = strlen(VMS_Device);
   if (!$VMS_STATUS_SUCCESS( sys$assign (&Device, &chan, 0, 0, 0) ))
     return -1;
-  status = sys$qiow (0, chan, IO$_SETMODE|IO$M_CTRL|IO$M_STARTUP, &iosb, 0, 0, 
+  status = sys$qiow (0, chan, IO$_SETMODE|IO$M_CTRL|IO$M_STARTUP, &iosb, 0, 0,
                      0, &setupdesc, 0, 0, 0, 0);
   if ((!$VMS_STATUS_SUCCESS(status)) || (!$VMS_STATUS_SUCCESS(iosb[0]))) {
     sys$dassgn(chan);
     return -1;
     }
-  status = sys$qiow (0, chan, IO$_SENSEMODE|IO$M_CTRL, &iosb, 0, 0, 
+  status = sys$qiow (0, chan, IO$_SENSEMODE|IO$M_CTRL, &iosb, 0, 0,
                      0, &chardesc, 0, 0, 0, 0);
   sys$dassgn(chan);
   if ((!$VMS_STATUS_SUCCESS(status)) || (!$VMS_STATUS_SUCCESS(iosb[0])))
@@ -1779,13 +1779,13 @@ static void eth_get_nic_hw_addr(ETH_DEV* dev, const char *devname, int set_on)
     char tool[CBUFSIZE];
     const char *turnon[] = {
         "ip link set dev %.*s up 2>/dev/null",
-        "ifconfig %.*s up 2>/dev/null", 
+        "ifconfig %.*s up 2>/dev/null",
         NULL};
     const char *patterns[] = {
         "ip link show %.*s 2>/dev/null | grep [0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]",
-        "ip link show %.*s 2>/dev/null | egrep [0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]",
+        "ip link show %.*s 2>/dev/null | grep -E [0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]",
         "ifconfig %.*s 2>/dev/null | grep [0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]",
-        "ifconfig %.*s 2>/dev/null | egrep [0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]",
+        "ifconfig %.*s 2>/dev/null | grep -E [0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]:[0-9a-fA-F]?[0-9a-fA-F]",
         NULL};
 
     memset(command, 0, sizeof(command));
@@ -1967,8 +1967,8 @@ switch (dev->eth_api) {
 
 sim_debug(dev->dbit, dev->dptr, "Reader Thread Starting\n");
 
-/* Boost Priority for this I/O thread vs the CPU instruction execution 
-   thread which, in general, won't be readily yielding the processor 
+/* Boost Priority for this I/O thread vs the CPU instruction execution
+   thread which, in general, won't be readily yielding the processor
    when this thread needs to run */
 sim_os_set_thread_priority (PRIORITY_ABOVE_NORMAL);
 
@@ -1991,7 +1991,7 @@ while (dev->handle) {
         {
         fd_set setl;
         struct timeval timeout;
-        
+
         FD_ZERO(&setl);
         FD_SET(select_fd, &setl);
         timeout.tv_sec = 0;
@@ -2001,7 +2001,7 @@ while (dev->handle) {
       }
     else
       sel_ret = 1;
-    if (sel_ret < 0 && errno != EINTR) 
+    if (sel_ret < 0 && errno != EINTR)
       break;
     }
   if (sel_ret > 0) {
@@ -2128,8 +2128,8 @@ _eth_writer(void *arg)
 ETH_DEV* volatile dev = (ETH_DEV*)arg;
 ETH_WRITE_REQUEST *request = NULL;
 
-/* Boost Priority for this I/O thread vs the CPU instruction execution 
-   thread which in general won't be readily yielding the processor when 
+/* Boost Priority for this I/O thread vs the CPU instruction execution
+   thread which in general won't be readily yielding the processor when
    this thread needs to run */
 sim_os_set_thread_priority (PRIORITY_ABOVE_NORMAL);
 
@@ -2177,9 +2177,9 @@ return NULL;
 }
 #endif
 
-/* eth_set_async 
+/* eth_set_async
  *
- * Turn on reciever processing which can be either asynchronous or polled 
+ * Turn on receiver processing which can be either asynchronous or polled
  */
 t_stat eth_set_async (ETH_DEV *dev, int latency)
 {
@@ -2203,9 +2203,9 @@ if (wakeup_needed) {
 return SCPE_OK;
 }
 
-/* eth_clr_async 
+/* eth_clr_async
  *
- * Turn off reciever processing
+ * Turn off receiver processing
  */
 t_stat eth_clr_async (ETH_DEV *dev)
 {
@@ -2345,7 +2345,7 @@ else { /* !tap: */
 #if defined(HAVE_VDE_NETWORK)
     char vdeswitch_s[CBUFSIZE]; /* VDE switch name */
     char vdeport_s[CBUFSIZE];   /* VDE switch port (optional), numeric */
-      
+
     struct vde_open_args voa;
     const char *devname = savname + 4;
 
@@ -2616,7 +2616,7 @@ if (1) {
   }
 #endif /* defined (USE_READER_THREAD */
 _eth_add_to_open_list (dev);
-/* 
+/*
  * install a total filter on a newly opened interface and let the device
  * simulator install an appropriate filter that reflects the device's
  * configuration.
@@ -2761,7 +2761,7 @@ if (!rand_initialized)
 return (rand() & 0xFF);
 }
 
-t_stat eth_check_address_conflict_ex (ETH_DEV* dev, 
+t_stat eth_check_address_conflict_ex (ETH_DEV* dev,
                                       ETH_MAC* const mac,
                                       int *reflections,
                                       t_bool silent)
@@ -2779,68 +2779,68 @@ eth_mac_fmt(mac, mac_string);
 sim_debug(dev->dbit, dev->dptr, "Determining Address Conflict for MAC address: %s\n", mac_string);
 
 /* 00:00:00:00:00:00 or any address with a multi-cast address is invalid */
-if ((((*mac)[0] == 0) && ((*mac)[1] == 0) && ((*mac)[2] == 0) && 
+if ((((*mac)[0] == 0) && ((*mac)[1] == 0) && ((*mac)[2] == 0) &&
      ((*mac)[3] == 0) && ((*mac)[4] == 0) && ((*mac)[5] == 0)) ||
      ((*mac)[0] & 1)) {
   return sim_messagef (SCPE_ARG, "%s: Invalid NIC MAC Address: %s\n", sim_dname(dev->dptr), mac_string);
   }
 
 /* The process of checking address conflicts is used in two ways:
-   1) to determine the behavior of the currently running packet 
-      delivery facility regarding whether it may receive copies 
-      of every packet sent (and how many). 
-   2) to verify if a MAC address which this facility is planning 
-      to use as the source address of packets is already in use 
-      by some other node on the local network 
-   Case #1, doesn't require (and explicitly doesn't want) any 
-   interaction or response from other systems on the LAN so 
-   therefore no considerations regarding switch packet forwarding 
-   are important.  Meanwhile, Case #2 does require responses from 
-   other components on the LAN to provide useful functionality. 
-   The original designers of this mechanism did this when essentially 
-   all LANs were single collision domains (i.e. ALL nodes which might 
+   1) to determine the behavior of the currently running packet
+      delivery facility regarding whether it may receive copies
+      of every packet sent (and how many).
+   2) to verify if a MAC address which this facility is planning
+      to use as the source address of packets is already in use
+      by some other node on the local network
+   Case #1, doesn't require (and explicitly doesn't want) any
+   interaction or response from other systems on the LAN so
+   therefore no considerations regarding switch packet forwarding
+   are important.  Meanwhile, Case #2 does require responses from
+   other components on the LAN to provide useful functionality.
+   The original designers of this mechanism did this when essentially
+   all LANs were single collision domains (i.e. ALL nodes which might
    be affected by an address conflict were physically present on a single
    Ethernet cable which might have been extended by a couple of repeaters).
-   Since that time, essentially no networks are single collision domains.  
-   Thick and thinwire Ethernet cables don't exist and very few networks 
-   even have hubs.  Today, essentially all LANs are deployed using one 
-   or more layers of network switches.  In a switched LAN environment, the 
-   switches on the LAN "learn" which ports on the LAN source traffic from 
-   which MAC addresses and then forward traffic destined for particular 
+   Since that time, essentially no networks are single collision domains.
+   Thick and thinwire Ethernet cables don't exist and very few networks
+   even have hubs.  Today, essentially all LANs are deployed using one
+   or more layers of network switches.  In a switched LAN environment, the
+   switches on the LAN "learn" which ports on the LAN source traffic from
+   which MAC addresses and then forward traffic destined for particular
    MAC address to the appropriate ports.  If a particular MAC address is
-   already in use somewhere on the LAN, then the switches "know" where 
-   it is.  The host based test using the loopback protocol is poorly 
+   already in use somewhere on the LAN, then the switches "know" where
+   it is.  The host based test using the loopback protocol is poorly
    designed to detect this condition.  This test is performed by the host
    first changing the device's Physical MAC address to the address which
    is to be tested, and then sending a loopback packet FROM AND TO this
    MAC address with a loopback reply to be sent by a system which may be
-   currently using the MAC address.  If no reply is received, then the 
+   currently using the MAC address.  If no reply is received, then the
    MAC address is presumed to be unused.  The sending of this packet will
    result in its delivery to the right system since the switch port/MAC
-   address tables know where to deliver packets destined to this MAC 
-   address, however the response it generates won't be delivered to the 
-   system performing the test since the switches on the LAN won't know 
-   about the local port being the right target for packets with this MAC 
-   address.  A better test design to detect these conflicts would be for 
+   address tables know where to deliver packets destined to this MAC
+   address, however the response it generates won't be delivered to the
+   system performing the test since the switches on the LAN won't know
+   about the local port being the right target for packets with this MAC
+   address.  A better test design to detect these conflicts would be for
    the testing system to send a loopback packet FROM the current physical
-   MAC address (BEFORE changing it) TO the MAC address being tested with 
-   the loopback response coming to the current physical MAC address of 
+   MAC address (BEFORE changing it) TO the MAC address being tested with
+   the loopback response coming to the current physical MAC address of
    the device.  If a response is received, then the address is in use and
-   the attempt to change the device's MAC address should fail.  Since we 
+   the attempt to change the device's MAC address should fail.  Since we
    can't change the software running in these simulators to implement this
-   better conflict detection approach, we can still "do the right thing" 
-   in the sim_ether layer.  We're already handling the loopback test 
-   packets specially since we always had to avoid receiving the packets 
-   which were being sent, but needed to allow for the incoming loopback 
+   better conflict detection approach, we can still "do the right thing"
+   in the sim_ether layer.  We're already handling the loopback test
+   packets specially since we always had to avoid receiving the packets
+   which were being sent, but needed to allow for the incoming loopback
    packets to be properly dealt with.  We can extend this current special
-   handling to change outgoing "loopback to self" packets to have source 
+   handling to change outgoing "loopback to self" packets to have source
    AND loopback destination addresses in the packets to be the host NIC's
-   physical address.  The switch network will already know the correct 
-   MAC/port relationship for the host NIC's physical address, so loopback 
+   physical address.  The switch network will already know the correct
+   MAC/port relationship for the host NIC's physical address, so loopback
    response packets will be delivered as needed.
 
-   Code in _eth_write and _eth_callback provide the special handling to 
-   perform the described loopback packet adjustments, and code in 
+   Code in _eth_write and _eth_callback provide the special handling to
+   perform the described loopback packet adjustments, and code in
    eth_filter_hash makes sure that the loopback response packets are received.
 
    */
@@ -2905,7 +2905,7 @@ if (reflections)
 return SCPE_OK;
 }
 
-t_stat eth_check_address_conflict (ETH_DEV* dev, 
+t_stat eth_check_address_conflict (ETH_DEV* dev,
                                    ETH_MAC* const mac)
 {
 char mac_string[32];
@@ -2983,13 +2983,13 @@ dev->error_needs_reset = (((dev->transmit_packet_errors + dev->receive_packet_er
 #endif
 /* Limit errors to 1 per second (per invoking thread (reader and writer)) */
 sim_os_sleep (1);
-/* 
+/*
  When all of the threads which can reference this ETH_DEV object are
  simultaneously waiting in this routine, we have the potential to close
  and reopen the network connection.
- We do this after ETH_ERROR_REOPEN_THRESHOLD total errors have occurred.  
- In practice could be as frequently as once every ETH_ERROR_REOPEN_THRESHOLD/2 
- seconds, but normally would be about once every 1.5*ETH_ERROR_REOPEN_THRESHOLD 
+ We do this after ETH_ERROR_REOPEN_THRESHOLD total errors have occurred.
+ In practice could be as frequently as once every ETH_ERROR_REOPEN_THRESHOLD/2
+ seconds, but normally would be about once every 1.5*ETH_ERROR_REOPEN_THRESHOLD
  seconds (ONLY when the error condition exists).
  */
 #ifdef USE_READER_THREAD
@@ -3128,7 +3128,7 @@ int write_queue_size = 1;
 /* make sure device exists */
 if ((!dev) || (dev->eth_api == ETH_API_NONE)) return SCPE_UNATT;
 
-if (packet->len > sizeof (packet->msg)) /* packet ovesized? */
+if (packet->len > sizeof (packet->msg)) /* packet oversized? */
     return SCPE_IERR;                   /* that's no good! */
 
 /* Get a buffer */
@@ -3199,26 +3199,26 @@ for (i=0; i<count; ++i) {
   int key = 0x3f & (eth_crc32(0, MultiCastList[i], 6) >> 26);
 
   key ^= 0x3F;
-  printf("MAC: %02X:%02X:%02X:%02X:%02X:%02X Key: %X, Byte: %X, Val: %X\n", 
-      MultiCastList[i][0], MultiCastList[i][1], MultiCastList[i][2], MultiCastList[i][3], MultiCastList[i][4], MultiCastList[i][5], 
+  printf("MAC: %02X:%02X:%02X:%02X:%02X:%02X Key: %X, Byte: %X, Val: %X\n",
+      MultiCastList[i][0], MultiCastList[i][1], MultiCastList[i][2], MultiCastList[i][3], MultiCastList[i][4], MultiCastList[i][5],
       key, key>>3, (1 << (key&0x7)));
   lhash[key>>3] |= (1 << (key&0x7));
   }
 if (memcmp(hash, lhash, sizeof(lhash))) {
   printf("Inconsistent Computed Hash:\n");
-  printf("Should be: %02X %02X %02X %02X %02X %02X %02X %02X\n", 
-         hash[0], hash[1], hash[2], hash[3], 
+  printf("Should be: %02X %02X %02X %02X %02X %02X %02X %02X\n",
+         hash[0], hash[1], hash[2], hash[3],
          hash[4], hash[5], hash[6], hash[7]);
-  printf("Was:       %02X %02X %02X %02X %02X %02X %02X %02X\n", 
-         lhash[0], lhash[1], lhash[2], lhash[3], 
+  printf("Was:       %02X %02X %02X %02X %02X %02X %02X %02X\n",
+         lhash[0], lhash[1], lhash[2], lhash[3],
          lhash[4], lhash[5], lhash[6], lhash[7]);
   }
 else {
-  printf("Should be: %02X %02X %02X %02X %02X %02X %02X %02X\n", 
-         hash[0], hash[1], hash[2], hash[3], 
+  printf("Should be: %02X %02X %02X %02X %02X %02X %02X %02X\n",
+         hash[0], hash[1], hash[2], hash[3],
          hash[4], hash[5], hash[6], hash[7]);
-  printf("Was:       %02X %02X %02X %02X %02X %02X %02X %02X\n", 
-         lhash[0], lhash[1], lhash[2], lhash[3], 
+  printf("Was:       %02X %02X %02X %02X %02X %02X %02X %02X\n",
+         lhash[0], lhash[1], lhash[2], lhash[3],
          lhash[4], lhash[5], lhash[6], lhash[7]);
   }
 return 0;
@@ -3310,11 +3310,11 @@ struct TCPHeader {
 #define IPPROTO_ICMP            1               /* control message protocol */
 #endif
 
-static uint16 
-ip_checksum(uint16 *buffer, int size) 
+static uint16
+ip_checksum(uint16 *buffer, int size)
 {
 unsigned long cksum = 0;
-    
+
 /* Sum all the words together, adding the final byte if size is odd  */
 while (size > 1) {
   cksum += *buffer++;
@@ -3332,16 +3332,16 @@ if (size) {
 /* Do a little shuffling  */
 cksum = (cksum >> 16) + (cksum & 0xffff);
 cksum += (cksum >> 16);
-    
+
 /* Return the bitwise complement of the resulting mishmash  */
 return (uint16)(~cksum);
 }
 
-/* 
+/*
  * src_addr and dest_addr are presented in network byte order
  */
 
-static uint16 
+static uint16
 pseudo_checksum(uint16 len, uint16 proto, void *nsrc_addr, void *ndest_addr, uint8 *buff)
 {
 uint32 sum;
@@ -3351,7 +3351,7 @@ uint16 *dest_addr = (uint16 *)ndest_addr;
 /* Sum the data first */
 sum = 0xffff&(~ip_checksum((uint16 *)buff, len));
 
-/* add the pseudo header which contains the IP source and 
+/* add the pseudo header which contains the IP source and
    destination addresses already in network byte order */
 sum += src_addr[0];
 sum += src_addr[1];
@@ -3363,7 +3363,7 @@ sum = sum + htons(proto) + htons(len);
 /* Do a little shuffling  */
 sum = (sum >> 16) + (sum & 0xffff);
 sum += (sum >> 16);
-    
+
 /* Return the bitwise complement of the resulting mishmash  */
 return (uint16)(~sum);
 }
@@ -3434,7 +3434,7 @@ switch (IP->proto) {
     /* We don't do anything with the TCP checksum since we're going to resegment the TCP data below */
     break;
   default:
-    ++dev->jumbo_dropped; /* We onlt handle UDP, ICMP and TCP jumbo frames others are dropped */
+    ++dev->jumbo_dropped; /* We only handle UDP, ICMP and TCP jumbo frames others are dropped */
     return;
   }
 /* Reasonable Checksums are now in the jumbo packet, but we've got to actually */
@@ -3450,8 +3450,8 @@ switch (IP->proto) {
   case IPPROTO_UDP:
   case IPPROTO_ICMP:
     ++dev->jumbo_fragmented;
-    /* When we're performing LSO (Large Send Offload), we're given a 
-       'template' header which may not include a value being populated 
+    /* When we're performing LSO (Large Send Offload), we're given a
+       'template' header which may not include a value being populated
        in the IP header length (which is only 16 bits).
        We process as payload everything which isn't known header data. */
     payload_len = (uint16)(len - (14 + IP_HLEN(IP)));
@@ -3477,8 +3477,8 @@ switch (IP->proto) {
            (i.e. we can use Wireshark to verify packet contents)
            we don't want to do this all the time for 2 reasons:
              1) sending through pcap involves kernel transitions and
-             2) if the current system reflects sent packets, the 
-                recieving side will receive and process 2 copies of 
+             2) if the current system reflects sent packets, the
+                receiving side will receive and process 2 copies of
                 any packets sent this way. */
         ETH_PACK pkt;
 
@@ -3504,8 +3504,8 @@ switch (IP->proto) {
     eth_packet_trace_ex (dev, ((u_char *)IP)-14, len, "Fragmenting Jumbo TCP segment", 1, dev->dbit);
     TCP = (struct TCPHeader *)(((char *)IP)+IP_HLEN(IP));
     orig_tcp_flags = ntohs(TCP->data_offset_and_flags);
-    /* When we're performing LSO (Large Send Offload), we're given a 
-       'template' header which may not include a value being populated 
+    /* When we're performing LSO (Large Send Offload), we're given a
+       'template' header which may not include a value being populated
        in the IP header length (which is only 16 bits).
        We process as payload everything which isn't known header data. */
     payload_len = (uint16)(len - (14 + IP_HLEN(IP) + TCP_DATA_OFFSET(TCP)));
@@ -3531,8 +3531,8 @@ switch (IP->proto) {
            (i.e. we can use Wireshark to verify packet contents)
            we don't want to do this all the time for 2 reasons:
              1) sending through pcap involves kernel transitions and
-             2) if the current system reflects sent packets, the 
-                recieving side will receive and process 2 copies of 
+             2) if the current system reflects sent packets, the
+                receiving side will receive and process 2 copies of
                 any packets sent this way. */
         ETH_PACK pkt;
 
@@ -3638,16 +3638,16 @@ function = data[offset] | (data[offset+1] << 8);
 if (function != 2) /*forward*/
   return 0;
 
-/* The only packets we should be responding to are ones which 
-   we received due to them being directed to our physical MAC address, 
-   OR the Broadcast address OR to a Multicast address we're listening to 
-   (we may receive others if we're in promiscuous mode, but shouldn't 
+/* The only packets we should be responding to are ones which
+   we received due to them being directed to our physical MAC address,
+   OR the Broadcast address OR to a Multicast address we're listening to
+   (we may receive others if we're in promiscuous mode, but shouldn't
    respond to them) */
 if ((0 == (data[0]&1)) &&           /* Multicast or Broadcast */
     (0 != memcmp(dev->filter_address[0], data, sizeof(ETH_MAC))))
   return 0;
 
-/* Attempts to forward to multicast or broadcast addresses are explicitly 
+/* Attempts to forward to multicast or broadcast addresses are explicitly
    ignored by consuming the packet and doing nothing else */
 if (data[offset+2]&1)
   return 1;
@@ -3771,7 +3771,7 @@ if (bpf_used ? to_me : (to_me && !from_me)) {
     return;
     }
   if (_eth_process_loopback(dev, data, header->len))
-    return;  
+    return;
 #if defined (USE_READER_THREAD)
   if (1) {
     int crc_len = 0;
@@ -3791,7 +3791,7 @@ if (bpf_used ? to_me : (to_me && !from_me)) {
     /* but were presumed to be traversing a NIC which was going to handle that task */
     /* This must be done before any needed CRC calculation */
     _eth_fix_ip_xsum_offload(dev, (const u_char*)data, len);
-    
+
     if (dev->need_crc)
       crc_len = eth_get_packet_crc32_data(data, len, crc_data);
 
@@ -3948,7 +3948,7 @@ if (status < 0) {
     status = 1;
     ethq_remove(&dev->read_queue);
   }
-  pthread_mutex_unlock (&dev->lock);  
+  pthread_mutex_unlock (&dev->lock);
   if ((status) && (routine))
     routine(0);
 #endif
@@ -3957,7 +3957,7 @@ return status;
 }
 
 t_stat eth_bpf_filter (ETH_DEV* dev, int addr_count, ETH_MAC* const filter_address,
-                       ETH_BOOL all_multicast, ETH_BOOL promiscuous, 
+                       ETH_BOOL all_multicast, ETH_BOOL promiscuous,
                        int reflections,
                        ETH_MAC* physical_addr,
                        ETH_MAC* host_nic_phy_hw_addr,
@@ -3986,9 +3986,9 @@ if (!promiscuous) {
     sprintf(&buf[strlen(buf)], ")");
   }
 
-/* construct source filters - this prevents packets from being reflected back 
+/* construct source filters - this prevents packets from being reflected back
    by systems where WinPcap and libpcap cause packet reflections. Note that
-   some systems do not reflect packets at all. This *assumes* that the 
+   some systems do not reflect packets at all. This *assumes* that the
    simulated NIC will not send out packets with multicast source fields. */
 if ((addr_count > 0) && (reflections > 0)) {
   if (strlen(buf) > 0)
@@ -4013,22 +4013,22 @@ if ((addr_count > 0) && (reflections > 0)) {
   }
 if (strlen(buf) > 0)
   sprintf(&buf[strlen(buf)], ")");
-/* When changing the Physical Address on a LAN interface, VMS sends out a 
-   loopback packet with the source and destination addresses set to the same 
+/* When changing the Physical Address on a LAN interface, VMS sends out a
+   loopback packet with the source and destination addresses set to the same
    value as the Physical Address which is being setup.  This packet is
-   designed to find and help diagnose MAC address conflicts (which also 
-   include DECnet address conflicts). Normally, this packet would not be 
-   seen by the sender, only by the other machine that has the same Physical 
-   Address (or possibly DECnet address). If the ethernet subsystem is 
-   reflecting packets, the network startup will fail to start if it sees the 
-   reflected packet, since it thinks another system is using this Physical 
-   Address (or DECnet address). We have to let these packets through, so 
+   designed to find and help diagnose MAC address conflicts (which also
+   include DECnet address conflicts). Normally, this packet would not be
+   seen by the sender, only by the other machine that has the same Physical
+   Address (or possibly DECnet address). If the ethernet subsystem is
+   reflecting packets, the network startup will fail to start if it sees the
+   reflected packet, since it thinks another system is using this Physical
+   Address (or DECnet address). We have to let these packets through, so
    that if another machine has the same Physical Address (or DECnet address)
-   that we can detect it. Both eth_write() and _eth_callback() help by 
+   that we can detect it. Both eth_write() and _eth_callback() help by
    checking the reflection count - eth_write() adds the reflection count to
    dev->loopback_self_sent, and _eth_callback() check the value - if the
-   dev->loopback_self_sent count is zero, then the packet has come from 
-   another machine with the same address, and needs to be passed on to the 
+   dev->loopback_self_sent count is zero, then the packet has come from
+   another machine with the same address, and needs to be passed on to the
    simulated machine. */
 /* check for physical address in filters */
 if ((!promiscuous) && (addr_count) && (reflections > 0)) {
@@ -4051,22 +4051,22 @@ return SCPE_OK;
 t_stat eth_filter(ETH_DEV* dev, int addr_count, ETH_MAC* const addresses,
                   ETH_BOOL all_multicast, ETH_BOOL promiscuous)
 {
-return eth_filter_hash_ex(dev, addr_count, addresses, 
+return eth_filter_hash_ex(dev, addr_count, addresses,
                           all_multicast, promiscuous, FALSE,
                           NULL);
 }
 
 t_stat eth_filter_hash(ETH_DEV* dev, int addr_count, ETH_MAC* const addresses,
-                       ETH_BOOL all_multicast, ETH_BOOL promiscuous, 
+                       ETH_BOOL all_multicast, ETH_BOOL promiscuous,
                        ETH_MULTIHASH* const hash)
 {
-return eth_filter_hash_ex(dev, addr_count, addresses, 
+return eth_filter_hash_ex(dev, addr_count, addresses,
                           all_multicast, promiscuous, TRUE,
                           hash);
 }
 
 t_stat eth_filter_hash_ex(ETH_DEV* dev, int addr_count, ETH_MAC* const addresses,
-                          ETH_BOOL all_multicast, ETH_BOOL promiscuous, 
+                          ETH_BOOL all_multicast, ETH_BOOL promiscuous,
                           ETH_BOOL match_broadcast, ETH_MULTIHASH* const hash)
 {
 int i;
@@ -4084,7 +4084,7 @@ if (!dev) return SCPE_UNATT;
 if ((addr_count < 0) || ((addr_count + (match_broadcast ? 1 : 0)) > ETH_FILTER_MAX))
   return SCPE_ARG;
 else
-  if (!addresses && (addr_count != 0)) 
+  if (!addresses && (addr_count != 0))
      return SCPE_ARG;
 
 /* test reflections.  This is done early in this routine since eth_reflect */
@@ -4111,7 +4111,7 @@ dev->hash_filter = (hash != NULL);
 if (hash) {
   memcpy(dev->hash, hash, sizeof(*hash));
   sim_debug(dev->dbit, dev->dptr, "Multicast Hash: %02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X\n",
-                                  dev->hash[0], dev->hash[1], dev->hash[2], dev->hash[3], 
+                                  dev->hash[0], dev->hash[1], dev->hash[2], dev->hash[3],
                                   dev->hash[4], dev->hash[5], dev->hash[6], dev->hash[7]);
   }
 
@@ -4151,14 +4151,14 @@ for (i = 0; i < addr_count; i++) {
 #endif
 
 /* setup BPF filters and other fields to minimize packet delivery */
-eth_bpf_filter (dev, dev->addr_count, dev->filter_address, 
-                dev->all_multicast, dev->promiscuous, 
-                dev->reflections, &dev->physical_addr, 
+eth_bpf_filter (dev, dev->addr_count, dev->filter_address,
+                dev->all_multicast, dev->promiscuous,
+                dev->reflections, &dev->physical_addr,
                 dev->have_host_nic_phy_addr ? &dev->host_nic_phy_hw_addr: NULL,
                 (dev->hash_filter ? &dev->hash : NULL), buf);
 
-/* get netmask, which is a required argument for compiling.  The value, 
-   in our case isn't actually interesting since the filters we generate 
+/* get netmask, which is a required argument for compiling.  The value,
+   in our case isn't actually interesting since the filters we generate
    aren't referencing IP fields, networks or values */
 
 #ifdef USE_BPF
@@ -4188,7 +4188,7 @@ if (dev->eth_api == ETH_API_PCAP) {
       sim_printf ("Eth: Promiscuous\n");
     if (dev->hash_filter)
       sim_printf ("Eth: Multicast Hash: %02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X\n",
-                  dev->hash[0], dev->hash[1], dev->hash[2], dev->hash[3], 
+                  dev->hash[0], dev->hash[1], dev->hash[2], dev->hash[3],
                   dev->hash[4], dev->hash[5], dev->hash[6], dev->hash[7]);
     if (dev->have_host_nic_phy_addr) {
       eth_mac_fmt(&dev->host_nic_phy_hw_addr, mac);
@@ -4433,9 +4433,9 @@ for (eth_num=0; eth_num<eth_device_count; eth_num++) {
               char errbuf[PCAP_ERRBUF_SIZE];
 
               ++bpf_count;
-              r = eth_bpf_filter (&dev, addr_count, &filter_address[0], 
-                                  all_multicast, promiscuous, reflections, 
-                                  &filter_address[0], 
+              r = eth_bpf_filter (&dev, addr_count, &filter_address[0],
+                                  all_multicast, promiscuous, reflections,
+                                  &filter_address[0],
                                   host_phy_addr_list[host_phy_addr_listindex],
                                   hash_list[hash_listindex],
                                   buf);
diff --git a/sim_ether.h b/sim_ether.h
index 0106a5e..e3161a9 100644
--- a/sim_ether.h
+++ b/sim_ether.h
@@ -31,12 +31,12 @@
   01-Mar-12  AGN  Cygwin doesn't have non-blocking pcap I/O pcap (it uses WinPcap)
   17-Nov-11  MP   Added dynamic loading of libpcap on *nix platforms
   30-Oct-11  MP   Added support for vde (Virtual Distributed Ethernet) networking
-  18-Apr-11  MP   Fixed race condition with self loopback packets in 
+  18-Apr-11  MP   Fixed race condition with self loopback packets in
                   multithreaded environments
   09-Dec-10  MP   Added support to determine if network address conflicts exist
   07-Dec-10  MP   Reworked DECnet self detection to the more general approach
                   of loopback self when any Physical Address is being set.
-  04-Dec-10  MP   Changed eth_write to do nonblocking writes when 
+  04-Dec-10  MP   Changed eth_write to do nonblocking writes when
                   USE_READER_THREAD is defined.
   07-Feb-08  MP   Added eth_show_dev to display ethernet state
   28-Jan-08  MP   Added eth_set_async
@@ -52,7 +52,7 @@
   14-Nov-03  DTH  Added #ifdef DECNET_FIX for problematic duplicate detection code
   07-Jun-03  MP   Added WIN32 support for DECNET duplicate address detection.
   05-Jun-03  DTH  Added used to struct eth_packet
-  01-Feb-03  MP   Changed some uint8 strings to char* to reflect usage 
+  01-Feb-03  MP   Changed some uint8 strings to char* to reflect usage
   22-Oct-02  DTH  Added all_multicast and promiscuous support
   21-Oct-02  DTH  Corrected copyright again
   16-Oct-02  DTH  Fixed copyright
@@ -82,7 +82,7 @@ extern "C" {
 #define USE_SETNONBLOCK 1
 #endif
 
-/* cygwin dowsn't have the right features to use the threaded network I/O */
+/* cygwin doesn't have the right features to use the threaded network I/O */
 #if defined(__CYGWIN__) || defined(__ZAURUS__) // psco added check for Zaurus platform
 #define DONT_USE_READER_THREAD
 #endif
@@ -135,9 +135,9 @@ extern "C" {
 #endif
 
 /*
-  USE_BPF is defined to let this code leverage the libpcap/OS kernel provided 
-  BPF packet filtering.  This generally will enhance performance.  It may not 
-  be available in some environments and/or it may not work correctly, so 
+  USE_BPF is defined to let this code leverage the libpcap/OS kernel provided
+  BPF packet filtering.  This generally will enhance performance.  It may not
+  be available in some environments and/or it may not work correctly, so
   undefining this will still provide working code here.
 */
 #if defined(HAVE_PCAP_NETWORK)
@@ -335,7 +335,7 @@ t_stat eth_open   (ETH_DEV* dev, const char* name,      /* open ethernet interfa
                    DEVICE* dptr, uint32 dbit);
 t_stat eth_close  (ETH_DEV* dev);                       /* close ethernet interface */
 t_stat eth_attach_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr);
-t_stat eth_write  (ETH_DEV* dev, ETH_PACK* packet,      /* write sychronous packet; */
+t_stat eth_write  (ETH_DEV* dev, ETH_PACK* packet,      /* write synchronous packet; */
                    ETH_PCALLBACK routine);              /*  callback when done */
 int eth_read      (ETH_DEV* dev, ETH_PACK* packet,      /* read single packet; */
                    ETH_PCALLBACK routine);              /*  callback when done*/
@@ -354,7 +354,7 @@ t_stat eth_filter_hash_ex (ETH_DEV* dev, int addr_count,/* set filter on incomin
                            ETH_BOOL promiscuous,
                            ETH_BOOL match_broadcast,
                            ETH_MULTIHASH* const hash);  /* AUTODIN II based 8 byte imperfect hash */
-t_stat eth_check_address_conflict (ETH_DEV* dev, 
+t_stat eth_check_address_conflict (ETH_DEV* dev,
                                    ETH_MAC* const address);
 const char *eth_version (void);                         /* Version of dynamically loaded library (pcap) */
 void eth_setcrc   (ETH_DEV* dev, int need_crc);         /* enable/disable CRC mode */
@@ -383,7 +383,7 @@ void ethq_remove (ETH_QUE* que);                        /* remove item from FIFO
 void ethq_insert (ETH_QUE* que, int32 type,             /* insert item into FIFO queue */
                   ETH_PACK* packet, int32 status);
 void ethq_insert_data(ETH_QUE* que, int32 type,         /* insert item into FIFO queue */
-                  const uint8 *data, int used, size_t len, 
+                  const uint8 *data, int used, size_t len,
                   size_t crc_len, const uint8 *crc_data, int32 status);
 t_stat ethq_destroy(ETH_QUE* que);                      /* release FIFO queue */
 const char *eth_capabilities(void);
diff --git a/sim_fio.c b/sim_fio.c
index f096b81..6707d9e 100644
--- a/sim_fio.c
+++ b/sim_fio.c
@@ -136,7 +136,7 @@ unsigned char by, *sptr, *dptr;
 if (sim_end || (count == 0) || (size == sizeof (char)))
     return;
 for (j = 0, dptr = sptr = (unsigned char *) bptr;       /* loop on items */
-     j < count; j++) { 
+     j < count; j++) {
     for (k = (int32)(size - 1); k >= (((int32) size + 1) / 2); k--) {
         by = *sptr;                                     /* swap end-for-end */
         *sptr++ = *(dptr + k);
@@ -359,7 +359,7 @@ if (NULL == _sim_expand_homedir (path, pathbuf, sizeof (pathbuf)))
 return rmdir (pathbuf);
 }
 
-static void _sim_filelist_entry (const char *directory, 
+static void _sim_filelist_entry (const char *directory,
                                  const char *filename,
                                  t_offset FileSize,
                                  const struct stat *filestat,
@@ -503,9 +503,9 @@ return (t_offset)(ftello64 (st));
 
 /* Apple OS/X */
 
-#if defined (__APPLE__) || defined (__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__) 
+#if defined (__APPLE__) || defined (__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__) || defined (__CYGWIN__)
 #define S_SIM_IO_FSEEK_EXT_ 1
-int sim_fseeko (FILE *st, t_offset xpos, int origin) 
+int sim_fseeko (FILE *st, t_offset xpos, int origin)
 {
 return fseeko (st, (off_t)xpos, origin);
 }
@@ -576,7 +576,7 @@ static void _time_t_to_filetime (time_t ttime, FILETIME *filetime)
 {
 t_uint64 time64;
 
-time64 = 134774;                /* Days betwen Jan 1, 1601 and Jan 1, 1970 */
+time64 = 134774;                /* Days between Jan 1, 1601 and Jan 1, 1970 */
 time64 *= 24;                   /* Hours */
 time64 *= 3600;                 /* Seconds */
 time64 += (t_uint64)ttime;      /* include time_t seconds */
@@ -674,7 +674,7 @@ if (AlreadyExists) {
 else
     *((DWORD *)((*shmem)->shm_base)) = (DWORD)size;     /* Save Size in first page */
 
-*addr = ((char *)(*shmem)->shm_base + SysInfo.dwPageSize);      /* Point to the second paget for data */
+*addr = ((char *)(*shmem)->shm_base + SysInfo.dwPageSize);      /* Point to the second page for data */
 return SCPE_OK;
 }
 
@@ -936,8 +936,8 @@ return FALSE;
 #endif /* defined (_WIN32) */
 
 #if defined(__VAX)
-/* 
- * We privide a 'basic' snprintf, which 'might' overrun a buffer, but
+/*
+ * We provide a 'basic' snprintf, which 'might' overrun a buffer, but
  * the actual use cases don't on other platforms and none of the callers
  * care about the function return value.
  */
@@ -977,7 +977,7 @@ return getcwd (buf, buf_size);
  *    %~pnI%      - expands filepath value to a path and name only
  *    %~nxI%      - expands filepath value to a file name and extension only
  *
- * In the above example above %I% can be replaced by other 
+ * In the above example above %I% can be replaced by other
  * environment variables or numeric parameters to a DO command
  * invocation.
  */
@@ -1001,7 +1001,7 @@ filepath = namebuf;
 
 /* Check for full or current directory relative path */
 if ((filepath[1] == ':')  ||
-    (filepath[0] == '/')  || 
+    (filepath[0] == '/')  ||
     (filepath[0] == '\\')){
         tot_len = 1 + strlen (filepath);
         fullpath = (char *)malloc (tot_len);
@@ -1155,7 +1155,7 @@ if ((hFind =  FindFirstFileA (cptr, &File)) != INVALID_HANDLE_VALUE) {
     c = strrchr (DirName, '\\');
     *c = '\0';                                  /* Truncate to just directory path */
     if (!pathsep ||                             /* Separator wasn't mentioned? */
-        (slash && (0 == strcmp (slash, "/*")))) 
+        (slash && (0 == strcmp (slash, "/*"))))
         pathsep = "\\";                         /* Default to Windows backslash */
     if (*pathsep == '/') {                      /* If slash separator? */
         while ((c = strchr (DirName, '\\')))
diff --git a/sim_frontpanel.c b/sim_frontpanel.c
index 4599fcb..c390ef9 100644
--- a/sim_frontpanel.c
+++ b/sim_frontpanel.c
@@ -28,15 +28,15 @@
    03-Apr-15    MP      Added logic to pass simulator startup messages in
                         panel error text if the connection to the simulator
                         shuts down while it is starting.
-   04-Apr-15    MP      Added mount and dismount routines to connect and 
+   04-Apr-15    MP      Added mount and dismount routines to connect and
                         disconnect removable media
 
    This module provides interface between a front panel application and a simh
-   simulator.  Facilities provide ways to gather information from and to 
+   simulator.  Facilities provide ways to gather information from and to
    observe and control the state of a simulator.
 
-   The details of the 'wire protocol' are internal to the API interfaces 
-   provided here and described in sim_frontpanel.h.  These details are subject 
+   The details of the 'wire protocol' are internal to the API interfaces
+   provided here and described in sim_frontpanel.h.  These details are subject
    to change from one sim_frontpanel version to the next, while all efforts
    will be made to retain any prior sim_frontpanel API interfaces.
 
@@ -189,19 +189,19 @@ struct PANEL {
  *
  *  Mutex:               Role:
  *   io_lock             Serialize access to panel state variables
- *                        acquired and released in application threads: 
+ *                        acquired and released in application threads:
  *                                                  _panel_register_query_string,
  *                                                  _panel_establish_register_bits_collection,
  *                                                  _panel_sendf
- *                        acquired and released in internal threads: 
+ *                        acquired and released in internal threads:
  *                                                  _panel_callback
  *                                                  _panel_reader
- *   io_send_lock        Serializes writes to a panel's sockets so that complete 
- *                       command/request data can be delivered before another 
+ *   io_send_lock        Serializes writes to a panel's sockets so that complete
+ *                       command/request data can be delivered before another
  *                       thread attempts to write to the socket.
  *                        acquired and released in: _panel_send
  *   io_command_lock     To serialize frontpanel application command requests
- *                        acquired and released in: _panel_get_registers, 
+ *                        acquired and released in: _panel_get_registers,
  *                                                  _panel_sendf_completion
  *
  *  Condition Var:  Sync Mutex:  Purpose & Duration:
@@ -291,8 +291,8 @@ while (p && p->Debug && (dbits & p->debug)) {
 
     clock_gettime(CLOCK_REALTIME, &time_now);
     sprintf (timestamp, "%lld.%03d ", (long long)(time_now.tv_sec), (int)(time_now.tv_nsec/1000000));
-    sprintf (threadname, "%s:%s ", p->parent ? p->device_name : "CPU", (pthread_getspecific (panel_thread_id)) ? (char *)pthread_getspecific (panel_thread_id) : ""); 
-    
+    sprintf (threadname, "%s:%s ", p->parent ? p->device_name : "CPU", (pthread_getspecific (panel_thread_id)) ? (char *)pthread_getspecific (panel_thread_id) : "");
+
     obuf[obufsize - 1] = '\0';
     len = vsnprintf (obuf, obufsize - 1, fmt, arglist);
     if (len < 0)
@@ -620,7 +620,7 @@ for (i=0; i<panel->reg_count; i++) {
         }
     }
 pthread_mutex_unlock (&panel->io_lock);
-if (_panel_sendf (panel, &cmd_stat, &response, "%s%u%s%u%s%u%s%s\r", register_collect_prefix, panel->sample_depth, 
+if (_panel_sendf (panel, &cmd_stat, &response, "%s%u%s%u%s%u%s%s\r", register_collect_prefix, panel->sample_depth,
                                                                      register_collect_mid1, panel->sample_frequency,
                                                                      register_collect_mid2, panel->sample_dither_pct,
                                                                      register_collect_mid3, buf)) {
@@ -669,7 +669,7 @@ int i;
 for (i=0; i<panel_count; i++) {
     if (panels[i] == p) {
         int j;
-        for (j=i+1; j<panel_count; j++) 
+        for (j=i+1; j<panel_count; j++)
             panels[j-1] = panels[j];
         --panel_count;
         if (panel_count == 0) {
@@ -869,7 +869,7 @@ if (!simulator_panel) {
         close (0); close (1); close (2);        /* make sure not to pass the open standard handles */
         if (dup (dup (open ("/dev/null", O_RDWR)))) {}; /* open standard handles to /dev/null */
         if (execlp (sim_path, sim_path, p->temp_config, NULL, NULL)) {
-            perror ("execl");
+            perror ("execlp");
             exit(errno);
             }
         }
@@ -1160,7 +1160,7 @@ if ((bit_count != 0) && (panel->sample_depth == 0)) {
     sim_panel_set_error (NULL, "sim_panel_set_sampling_parameters() must be called first");
     return -1;
     }
-regs = (REG *)_panel_malloc ((1 + panel->reg_count)*sizeof(*regs)); 
+regs = (REG *)_panel_malloc ((1 + panel->reg_count)*sizeof(*regs));
 if (regs == NULL)
     return sim_panel_set_error (panel, "_panel_add_register(): Out of Memory\n");
 pthread_mutex_lock (&panel->io_lock);
@@ -1216,8 +1216,8 @@ for (i=0; i<panel->reg_count; i++) {
         }
     sprintf (t1, "%s %s", regs[i].device_name ? regs[i].device_name : "", regs[i].name);
     sprintf (t2, "%s %s", reg->device_name ? reg->device_name : "", reg->name);
-    if ((!strcmp (t1, t2)) && 
-        (reg->indirect == regs[i].indirect) && 
+    if ((!strcmp (t1, t2)) &&
+        (reg->indirect == regs[i].indirect) &&
         ((reg->bits == NULL) == (regs[i].bits == NULL))) {
         pthread_mutex_unlock (&panel->io_lock);
         sim_panel_set_error (NULL, "Duplicate Register Declaration");
@@ -1379,9 +1379,9 @@ return _panel_get_registers (panel, (panel->State == Halt), simulation_time);
 }
 
 int
-sim_panel_set_display_callback_interval (PANEL *panel, 
-                                         PANEL_DISPLAY_PCALLBACK callback, 
-                                         void *context, 
+sim_panel_set_display_callback_interval (PANEL *panel,
+                                         PANEL_DISPLAY_PCALLBACK callback,
+                                         void *context,
                                          int usecs_between_callbacks)
 {
 if (!panel) {
@@ -1707,7 +1707,7 @@ return 0;
  */
 
 int
-sim_panel_gen_examine (PANEL *panel, 
+sim_panel_gen_examine (PANEL *panel,
                        const char *name_or_addr,
                        size_t size,
                        void *value)
@@ -1755,7 +1755,7 @@ return 0;
  */
 
 int
-sim_panel_get_history (PANEL *panel, 
+sim_panel_get_history (PANEL *panel,
                        int count,
                        size_t size,
                        char *buffer)
@@ -1781,7 +1781,7 @@ return 0;
 }
 
 int
-sim_panel_device_debug_mode (PANEL *panel, 
+sim_panel_device_debug_mode (PANEL *panel,
                              const char *device,
                              int set_unset,
                              const char *mode_bits)
@@ -1796,17 +1796,17 @@ if (!panel || (panel->State == Error)) {
 if ((device != NULL) &&
     ((_panel_sendf (panel, &cmd_stat, &response, "SHOW %s", device) ||
      (cmd_stat)))) {
-    sim_panel_set_error (NULL, "Can't %s Debug Mode: '%s' on Device '%s': %s", 
+    sim_panel_set_error (NULL, "Can't %s Debug Mode: '%s' on Device '%s': %s",
                                set_unset ? "Enable" : "Disable", mode_bits ? mode_bits : "", device, response);
     free (response);
     return -1;
     }
 free (response);
 response = NULL;
-if (_panel_sendf (panel, &cmd_stat, &response, "%sDEBUG %s %s", 
+if (_panel_sendf (panel, &cmd_stat, &response, "%sDEBUG %s %s",
                          set_unset ? "" : "NO", device ? device : "", mode_bits ? mode_bits : "") ||
     (cmd_stat)) {
-    sim_panel_set_error (NULL, "Can't %s Debug Mode: '%s' on Device '%s': %s", 
+    sim_panel_set_error (NULL, "Can't %s Debug Mode: '%s' on Device '%s': %s",
                                set_unset ? "Enable" : "Disable", mode_bits ? mode_bits : "", device, response);
     free (response);
     return -1;
@@ -1822,12 +1822,12 @@ return 0;
         name_or_addr the name the simulator knows this register by
         size         the size (in local storage) of the buffer which
                      contains the data to be deposited into the simulator
-        value        a pointer to the buffer which contains the data to 
+        value        a pointer to the buffer which contains the data to
                      be deposited into the simulator
  */
 
 int
-sim_panel_gen_deposit (PANEL *panel, 
+sim_panel_gen_deposit (PANEL *panel,
                        const char *name_or_addr,
                        size_t size,
                        const void *value)
@@ -1856,7 +1856,7 @@ return 0;
 
    sim_panel_mem_examine
 
-        addr_size    the size (in local storage) of the buffer which 
+        addr_size    the size (in local storage) of the buffer which
                      contains the memory address of the data to be examined
                      in the simulator
         addr         a pointer to the buffer containing the memory address
@@ -1868,7 +1868,7 @@ return 0;
  */
 
 int
-sim_panel_mem_examine (PANEL *panel, 
+sim_panel_mem_examine (PANEL *panel,
                        size_t addr_size,
                        const void *addr,
                        size_t value_size,
@@ -1913,7 +1913,7 @@ return 0;
 
    sim_panel_mem_deposit
 
-        addr_size    the size (in local storage) of the buffer which 
+        addr_size    the size (in local storage) of the buffer which
                      contains the memory address of the data to be deposited
                      into the simulator
         addr         a pointer to the buffer containing the memory address
@@ -1925,7 +1925,7 @@ return 0;
  */
 
  int
-sim_panel_mem_deposit (PANEL *panel, 
+sim_panel_mem_deposit (PANEL *panel,
                        size_t addr_size,
                        const void *addr,
                        size_t value_size,
@@ -1959,17 +1959,17 @@ return 0;
 
    sim_panel_mem_deposit_instruction
 
-        addr_size    the size (in local storage) of the buffer which 
+        addr_size    the size (in local storage) of the buffer which
                      contains the memory address of the data to be deposited
                      into the simulator
         addr         a pointer to the buffer containing the memory address
                      of the data to be deposited into the simulator
-        instruction  a pointer to the buffer that contains the mnemonic 
+        instruction  a pointer to the buffer that contains the mnemonic
                      instruction to be deposited at the indicated address
  */
 
  int
-sim_panel_mem_deposit_instruction (PANEL *panel, 
+sim_panel_mem_deposit_instruction (PANEL *panel,
                                    size_t addr_size,
                                    const void *addr,
                                    const char *instruction)
@@ -1999,8 +1999,8 @@ return 0;
 
         name        the name of a simulator register or a memory address
                     which is to receive a new value
-        value       the new value in character string form.  The string 
-                    must be in the native/natural radix that the simulator 
+        value       the new value in character string form.  The string
+                    must be in the native/natural radix that the simulator
                     uses when referencing that register
 
  */
@@ -2118,8 +2118,8 @@ int buf_data = 0;
 int processing_register_output = 0;
 int io_wait_done = 0;
 
-/* 
-   Boost Priority for this response processing thread to quickly digest 
+/*
+   Boost Priority for this response processing thread to quickly digest
    arriving data.
  */
 pthread_getschedparam (pthread_self(), &sched_policy, &sched_priority);
@@ -2201,13 +2201,13 @@ while ((p->sock != INVALID_SOCKET) &&
                         ++s;
                     continue;                                   /* process next line */
                     }
-                if ((*s == '}') && 
+                if ((*s == '}') &&
                     (3 == sscanf (s, "}%s %s %s", smp_dev, smp_reg, smp_ind))) {   /* Register bit Sample Data? */
                     r = NULL;
                     for (i=0; i<p->reg_count; i++) {
                         if (p->regs[i].bits == NULL)
                             continue;
-                        if ((!strcmp (smp_reg, p->regs[i].name)) && 
+                        if ((!strcmp (smp_reg, p->regs[i].name)) &&
                             ((!p->device_name) || (!strcmp (smp_dev, p->device_name)))) {
                             r = &p->regs[i];
                             break;
@@ -2283,7 +2283,7 @@ while ((p->sock != INVALID_SOCKET) &&
 
                             if (end)
                                 end_index = (size_t)atoi (end + 1);
-                            if (strcmp (e, " same as above")) 
+                            if (strcmp (e, " same as above"))
                                 p->array_element_data = strtoull (e, NULL, 16);
                             while (array_index <= end_index) {
                                 if (little_endian)
@@ -2319,14 +2319,14 @@ while ((p->sock != INVALID_SOCKET) &&
             p->io_response[p->io_response_data] = '\0';
             goto Start_Next_Line;
             }
-        if ((strlen (s) > strlen (sim_prompt)) && 
+        if ((strlen (s) > strlen (sim_prompt)) &&
             ((!strcmp (s + strlen (sim_prompt), register_repeat_start)) ||
              (!strcmp (s + strlen (sim_prompt), register_get_start)))) {
             _panel_debug (p, DBG_RCV, "*Repeat/Register Block Starting", NULL, 0);
             processing_register_output = 1;
             goto Start_Next_Line;
             }
-        if ((strlen (s) > strlen (sim_prompt)) && 
+        if ((strlen (s) > strlen (sim_prompt)) &&
             (!strcmp (s + strlen (sim_prompt), register_get_end))) {
             _panel_debug (p, DBG_RCV, "*Register Block Complete", NULL, 0);
             p->io_waiting = 0;
@@ -2359,8 +2359,8 @@ while ((p->sock != INVALID_SOCKET) &&
         p->io_response_data += strlen(s);
         strcpy (p->io_response + p->io_response_data, "\r\n");
         p->io_response_data += 2;
-        if ((!p->parent) && 
-            (p->completion_string) && 
+        if ((!p->parent) &&
+            (p->completion_string) &&
             (!memcmp (s, p->completion_string, strlen (p->completion_string)))) {
             _panel_debug (p, DBG_RCV, "Match with potentially coalesced additional data: '%s'", NULL, 0, p->completion_string);
             if (eol < &buf[buf_data])
@@ -2376,8 +2376,8 @@ Start_Next_Line:
     buf_data = strlen (buf);
     if (buf_data)
         _panel_debug (p, DBG_RSP, "Remnant Buffer Contents: '%s'", NULL, 0, buf);
-    if ((!p->parent) && 
-        (p->completion_string) && 
+    if ((!p->parent) &&
+        (p->completion_string) &&
         (!memcmp (buf, p->completion_string, strlen (p->completion_string)))) {
         _panel_debug (p, DBG_RCV, "*Received Command Complete - Match: '%s'", NULL, 0, p->completion_string);
         io_wait_done = 1;
@@ -2448,8 +2448,8 @@ size_t buf_data = 0;
 unsigned int callback_count = 0;
 int cmd_stat;
 
-/* 
-   Boost Priority for timer thread so it doesn't compete 
+/*
+   Boost Priority for timer thread so it doesn't compete
    with compute bound activities.
  */
 pthread_getschedparam (pthread_self(), &sched_policy, &sched_priority);
@@ -2464,7 +2464,7 @@ pthread_mutex_unlock (&p->io_lock);
 pthread_cond_signal (&p->startup_done);   /* Signal we're ready to go */
 msleep (100);
 pthread_mutex_lock (&p->io_lock);
-while ((p->sock != INVALID_SOCKET) && 
+while ((p->sock != INVALID_SOCKET) &&
        (p->usecs_between_callbacks) &&
        (p->State != Error)) {
     int interval = p->usecs_between_callbacks;
@@ -2501,9 +2501,9 @@ while ((p->sock != INVALID_SOCKET) &&
             buf_data -= (c - buf) + strlen (register_get_start);
             c += strlen (register_get_start);
             }
-        sprintf (repeat, "%s%d%s%s%*.*s", register_repeat_prefix, 
-                                     p->usecs_between_callbacks, 
-                                     register_repeat_units, 
+        sprintf (repeat, "%s%d%s%s%*.*s", register_repeat_prefix,
+                                     p->usecs_between_callbacks,
+                                     register_repeat_units,
                                      register_repeat_start,
                                      (int)buf_data, (int)buf_data, c);
         pthread_mutex_unlock (&p->io_lock);
diff --git a/sim_frontpanel.h b/sim_frontpanel.h
index 0e03a88..ea4fbd6 100644
--- a/sim_frontpanel.h
+++ b/sim_frontpanel.h
@@ -28,18 +28,18 @@
    03-Apr-15    MP      Added logic to pass simulator startup messages in
                         panel error text if the connection to the simulator
                         shuts down while it is starting.
-   04-Apr-15    MP      Added mount and dismount routines to connect and 
+   04-Apr-15    MP      Added mount and dismount routines to connect and
                         disconnect removable media
 
    This module defines interface between a front panel application and a simh
-   simulator.  Facilities provide ways to gather information from and to 
+   simulator.  Facilities provide ways to gather information from and to
    observe and control the state of a simulator.
 
    Any application which wants to use this API needs to:
       1) include this file in the application code
-      2) compile sim_frontpanel.c and sim_sock.c from the top level directory 
+      2) compile sim_frontpanel.c and sim_sock.c from the top level directory
          of the simh source.
-      3) link the sim_frontpanel and sim_sock object modules and libpthreads 
+      3) link the sim_frontpanel and sim_sock object modules and libpthreads
          into the application.
       4) Use a simh simulator built from the same version of simh that the
          sim_frontpanel and sim_sock modules came from.
@@ -60,21 +60,21 @@ extern "C" {
 
 /**
 
-    sim_panel_start_simulator       A starts a simulator with a particular 
+    sim_panel_start_simulator       A starts a simulator with a particular
                                     configuration
 
         sim_path            the path to the simulator binary
         sim_config          the configuration to run the simulator with
         device_panel_count  the number of sub panels for connected devices
 
-    Note 1: - The path specified must be either a fully specified path or 
+    Note 1: - The path specified must be either a fully specified path or
               it could be merely the simulator name if the simulator binary
               is located in the current PATH.
-            - The simulator binary must be built from the same version 
-              simh source code that the frontpanel API was acquired fron 
-              (the API and the simh framework must speak the same language) 
+            - The simulator binary must be built from the same version
+              simh source code that the frontpanel API was acquired from
+              (the API and the simh framework must speak the same language)
 
-    Note 2: - Configuration file specified should contain device setup 
+    Note 2: - Configuration file specified should contain device setup
               statements (enable, disable, CPU types and attach commands).
               It should not start a simulator running.
  */
@@ -94,7 +94,7 @@ sim_panel_start_simulator_debug (const char *sim_path,
 
 /**
 
-    sim_panel_add_device_panel - creates a sub panel associated 
+    sim_panel_add_device_panel - creates a sub panel associated
                                  with a specific simulator panel
 
         simulator_panel     the simulator panel to connect to
@@ -109,7 +109,7 @@ sim_panel_add_device_panel (PANEL *simulator_panel,
 
     sim_panel_destroy   to shutdown a panel or sub panel.
 
-    Note: destroying a simulator panel will also destroy any 
+    Note: destroying a simulator panel will also destroy any
           related sub panels
  */
 
@@ -118,18 +118,18 @@ sim_panel_destroy (PANEL *panel);
 
 /**
 
-   The frontpanel API exposes the state of a simulator via access to 
+   The frontpanel API exposes the state of a simulator via access to
    simh register variables that the simulator and its devices define.
-   These registers certainly include any architecturally described 
+   These registers certainly include any architecturally described
    registers (PC, PSL, SP, etc.), but also include anything else
-   the simulator uses as internal state to implement the running 
+   the simulator uses as internal state to implement the running
    simulator.
 
-   The registers that a particular frontpanel application mught need 
-   access to are specified by the application when it calls: 
-   
+   The registers that a particular frontpanel application might need
+   access to are specified by the application when it calls:
+
    sim_panel_add_register
-   sim_panel_add_register_bits 
+   sim_panel_add_register_bits
    sim_panel_add_register_array
 and
    sim_panel_add_register_indirect
@@ -142,13 +142,13 @@ and
         element_count number of elements in the register array
         size         the size (in local storage) of the buffer which will
                      receive the data in the simulator's register
-        addr         a pointer to the location of the buffer which will 
+        addr         a pointer to the location of the buffer which will
                      be loaded with the data in the simulator's register
         bit_width    the number of values to populate in the bits array
-        bits         an array of integers which is bit_width long that 
+        bits         an array of integers which is bit_width long that
                      will receive each bit's current accumulated value.
-                     The accumulated value will range from 0 thru the 
-                     the sample_depth specified when calling 
+                     The accumulated value will range from 0 thru the
+                     the sample_depth specified when calling
                      sim_panel_set_sampling_parameters().
  */
 
@@ -190,58 +190,58 @@ sim_panel_add_register_indirect_bits (PANEL *panel,
 
 /**
 
-    A panel application has a choice of two different methods of getting 
+    A panel application has a choice of two different methods of getting
     the values contained in the set of registers it has declared interest in via
     the sim_panel_add_register APIs.
-    
+
        1)  The values can be polled (whenever it is desired) by calling
            sim_panel_get_registers().
-       2)  The panel can call sim_panel_set_display_callback_interval() to 
-           specify a callback routine and a periodic rate that the callback 
-           routine should be called.  The panel API will make a best effort 
+       2)  The panel can call sim_panel_set_display_callback_interval() to
+           specify a callback routine and a periodic rate that the callback
+           routine should be called.  The panel API will make a best effort
            to deliver the current register state at the desired rate.
 
 
-   Note 1: The buffers described in a panel's register set will be 
-           dynamically revised as soon as data is available from the 
-           simulator.  The callback routine merely serves as a notification 
+   Note 1: The buffers described in a panel's register set will be
+           dynamically revised as soon as data is available from the
+           simulator.  The callback routine merely serves as a notification
            that a complete register set has arrived.
    Note 2: The callback routine should, in general, not run for a long time
-           or frontpanel interactions with the simulator may be disrupted.  
-           Setting a flag, signaling an event or posting a message are 
+           or frontpanel interactions with the simulator may be disrupted.
+           Setting a flag, signaling an event or posting a message are
            reasonable activities to perform in a callback routine.
  */
 
 int
 sim_panel_get_registers (PANEL *panel, unsigned long long *simulation_time);
 
-typedef void (*PANEL_DISPLAY_PCALLBACK)(PANEL *panel, 
+typedef void (*PANEL_DISPLAY_PCALLBACK)(PANEL *panel,
                                         unsigned long long simulation_time,
                                         void *context);
 
 int
-sim_panel_set_display_callback_interval (PANEL *panel, 
-                                         PANEL_DISPLAY_PCALLBACK callback, 
-                                         void *context, 
+sim_panel_set_display_callback_interval (PANEL *panel,
+                                         PANEL_DISPLAY_PCALLBACK callback,
+                                         void *context,
                                          int usecs_between_callbacks);
 
 /**
 
     When a front panel application wants to get averaged bit sample
     values, it must first declare the sampling parameters that will
-    be used while collecting the bit values.  The dithering 
+    be used while collecting the bit values.  The dithering
     percentage must be 25% or less and when non 0 causes the sample
-    frequency to vary by plus or minus a random percentage value up 
+    frequency to vary by plus or minus a random percentage value up
     to the specified value.
 
-   sim_panel_set_sampling_parameters 
-   sim_panel_set_sampling_parameters_ex 
+   sim_panel_set_sampling_parameters
+   sim_panel_set_sampling_parameters_ex
 
         sample_frequency    cycles/instructions between sample captures
         sample_dither_pct   percentage of sample_frequency to vary randomly
         sample_depth        how many samples to accumulate in the rolling
                             average for each bit sample.  Returned bit
-                            sample values will range from 0 thru this 
+                            sample values will range from 0 thru this
                             value.
  */
 
@@ -258,13 +258,13 @@ sim_panel_set_sampling_parameters (PANEL *panel,
 /**
 
     When a front panel application needs to change the running
-    state of a simulator one of the following routines should 
-    be called:  
-    
+    state of a simulator one of the following routines should
+    be called:
+
     sim_panel_exec_halt     - Stop instruction execution
     sim_panel_exec_boot     - Boot a simulator from a specific device
     sim_panel_exec_run      - Start/Resume a simulator running instructions
-    sim_panel_exec_start    - Start a simulator running instructions 
+    sim_panel_exec_start    - Start a simulator running instructions
                               after resetting all devices
     sim_panel_exec_step     - Have a simulator execute a single step
  */
@@ -290,7 +290,7 @@ sim_panel_exec_step (PANEL *panel);
     A simulator often displays some useful information as it stops
     executing instructions.
 
-    sim_panel_halt_text     - Returns the simulator output immediately prior 
+    sim_panel_halt_text     - Returns the simulator output immediately prior
                               to the most recent transition to the Halt state.
  */
 
@@ -299,20 +299,20 @@ sim_panel_halt_text (PANEL *panel);
 
 /**
 
-    When a front panel application wants to describe conditions that 
+    When a front panel application wants to describe conditions that
     should stop instruction execution an execution or an output
-    breakpoint should be used.  To established or clear a breakpoint, 
-    one of the following routines should be called:  
-    
+    breakpoint should be used.  To established or clear a breakpoint,
+    one of the following routines should be called:
+
     sim_panel_break_set          - Establish a simulation breakpoint
     sim_panel_break_clear        - Cancel/Delete a previously defined
                                    breakpoint
-    sim_panel_break_output_set   - Establish a simulator output 
+    sim_panel_break_output_set   - Establish a simulator output
                                    breakpoint
     sim_panel_break_output_clear - Cancel/Delete a previously defined
                                    output breakpoint
-    
-    Note: Any breakpoint switches/flags must be located at the 
+
+    Note: Any breakpoint switches/flags must be located at the
           beginning of the condition string
  */
 
@@ -332,16 +332,16 @@ sim_panel_break_output_clear (PANEL *panel, const char *condition);
 /**
 
     When a front panel application needs to change or access
-    memory or a register one of the following routines should 
-    be called:  
-    
+    memory or a register one of the following routines should
+    be called:
+
     sim_panel_gen_examine               - Examine register or memory
     sim_panel_gen_deposit               - Deposit to register or memory
     sim_panel_mem_examine               - Examine memory location
     sim_panel_mem_deposit               - Deposit to memory location
-    sim_panel_mem_deposit_instruction   - Deposit instruction to memory 
+    sim_panel_mem_deposit_instruction   - Deposit instruction to memory
                                           location
-    sim_panel_set_register_value        - Deposit to a register or memory 
+    sim_panel_set_register_value        - Deposit to a register or memory
                                           location
  */
 
@@ -358,7 +358,7 @@ sim_panel_break_output_clear (PANEL *panel, const char *condition);
  */
 
 int
-sim_panel_gen_examine (PANEL *panel, 
+sim_panel_gen_examine (PANEL *panel,
                        const char *name_or_addr,
                        size_t size,
                        void *value);
@@ -370,12 +370,12 @@ sim_panel_gen_examine (PANEL *panel,
         name_or_addr the name the simulator knows this register by
         size         the size (in local storage) of the buffer which
                      contains the data to be deposited into the simulator
-        value        a pointer to the buffer which contains the data to 
+        value        a pointer to the buffer which contains the data to
                      be deposited into the simulator
  */
 
 int
-sim_panel_gen_deposit (PANEL *panel, 
+sim_panel_gen_deposit (PANEL *panel,
                        const char *name_or_addr,
                        size_t size,
                        const void *value);
@@ -384,7 +384,7 @@ sim_panel_gen_deposit (PANEL *panel,
 
    sim_panel_mem_examine
 
-        addr_size    the size (in local storage) of the buffer which 
+        addr_size    the size (in local storage) of the buffer which
                      contains the memory address of the data to be examined
                      in the simulator
         addr         a pointer to the buffer containing the memory address
@@ -396,7 +396,7 @@ sim_panel_gen_deposit (PANEL *panel,
  */
 
 int
-sim_panel_mem_examine (PANEL *panel, 
+sim_panel_mem_examine (PANEL *panel,
                        size_t addr_size,
                        const void *addr,
                        size_t value_size,
@@ -406,7 +406,7 @@ sim_panel_mem_examine (PANEL *panel,
 
    sim_panel_mem_deposit
 
-        addr_size    the size (in local storage) of the buffer which 
+        addr_size    the size (in local storage) of the buffer which
                      contains the memory address of the data to be deposited
                      into the simulator
         addr         a pointer to the buffer containing the memory address
@@ -418,7 +418,7 @@ sim_panel_mem_examine (PANEL *panel,
  */
 
 int
-sim_panel_mem_deposit (PANEL *panel, 
+sim_panel_mem_deposit (PANEL *panel,
                        size_t addr_size,
                        const void *addr,
                        size_t value_size,
@@ -428,17 +428,17 @@ sim_panel_mem_deposit (PANEL *panel,
 
    sim_panel_mem_deposit_instruction
 
-        addr_size    the size (in local storage) of the buffer which 
+        addr_size    the size (in local storage) of the buffer which
                      contains the memory address of the data to be deposited
                      into the simulator
         addr         a pointer to the buffer containing the memory address
                      of the data to be deposited into the simulator
-        instruction  a pointer to the buffer that contains the mnemonic 
+        instruction  a pointer to the buffer that contains the mnemonic
                      instruction to be deposited at the indicated address
  */
 
 int
-sim_panel_mem_deposit_instruction (PANEL *panel, 
+sim_panel_mem_deposit_instruction (PANEL *panel,
                                    size_t addr_size,
                                    const void *addr,
                                    const char *instruction);
@@ -449,8 +449,8 @@ sim_panel_mem_deposit_instruction (PANEL *panel,
 
         name        the name of a simulator register or a memory address
                     which is to receive a new value
-        value       the new value in character string form.  The string 
-                    must be in the native/natural radix that the simulator 
+        value       the new value in character string form.  The string
+                    must be in the native/natural radix that the simulator
                     uses when referencing that register
  */
 int
@@ -461,9 +461,9 @@ sim_panel_set_register_value (PANEL *panel,
 /**
 
     A front panel application might want to have access to the
-    instruction execution history that a simulator may be capable 
+    instruction execution history that a simulator may be capable
     of providing.  If this functionality is desired, enabling of
-    recording instruction history should be explicitly enabled 
+    recording instruction history should be explicitly enabled
     in the sim_config file that the simulator is started with.
  */
 
@@ -479,7 +479,7 @@ sim_panel_set_register_value (PANEL *panel,
  */
 
 int
-sim_panel_get_history (PANEL *panel, 
+sim_panel_get_history (PANEL *panel,
                        int count,
                        size_t size,
                        char *buffer);
@@ -488,7 +488,7 @@ sim_panel_get_history (PANEL *panel,
 /**
 
     A front panel application might want some details of simulator
-    and/or device behavior that is provided by a particular simulator 
+    and/or device behavior that is provided by a particular simulator
     via debug information.  Debugging for particular device(s)
     and/or simulator debug settings can be controlled via the
     sim_panel_device_debug_mode API.
@@ -499,15 +499,15 @@ sim_panel_get_history (PANEL *panel,
    sim_panel_device_debug_mode
 
         device       the device whose debug mode is to change
-        set_untset   1 to set debug flags, 0 to clear debug flags
-        mode_bits    character string with different debug mode bits 
+        set_unset    1 to set debug flags, 0 to clear debug flags
+        mode_bits    character string with different debug mode bits
                      to enable or disable.  An empty string will
-                     enable or disable all mode bits for the specified 
+                     enable or disable all mode bits for the specified
                      device
  */
 
 int
-sim_panel_device_debug_mode (PANEL *panel, 
+sim_panel_device_debug_mode (PANEL *panel,
                              const char *device,
                              int set_unset,
                              const char *mode_bits);
@@ -516,11 +516,11 @@ sim_panel_device_debug_mode (PANEL *panel,
 /**
 
     When a front panel application needs to change the media
-    in a simulated removable media device one of the following 
+    in a simulated removable media device one of the following
     routines should be called:
 
     sim_panel_mount    - mounts the indicated media file on a device
-    sim_panel_dismount - dismounts the currently mounted media file 
+    sim_panel_dismount - dismounts the currently mounted media file
                          from a device
  */
 
@@ -564,13 +564,13 @@ sim_panel_get_state (PANEL *panel);
 
 /**
 
-    All API routines which return an int return 0 for 
-    success and -1 for an error.  
+    All API routines which return an int return 0 for
+    success and -1 for an error.
 
     An API which returns an error (-1), will not change the panel state
     except to possibly set the panel state to Error if the panel
     condition is no longer useful.
-    
+
     sim_panel_get_error     - the details of the most recent error
     sim_panel_clear_error   - clears the error buffer
  */
@@ -580,8 +580,8 @@ void sim_panel_clear_error (void);
 
 /**
 
-    The panek<->simulator wire protocol can be traced if protocol problems arise.
-    
+    The panel<->simulator wire protocol can be traced if protocol problems arise.
+
     sim_panel_set_debug_mode    - Specifies the debug detail to be recorded
     sim_panel_flush_debug       - Flushes debug output to disk
     sim_panel_debug       -       Write message to the debug file
diff --git a/sim_imd.c b/sim_imd.c
index 45c1019..2aa5364 100644
--- a/sim_imd.c
+++ b/sim_imd.c
@@ -156,7 +156,7 @@ static t_stat diskParse(DISK_INFO *myDisk, uint32 isVerbose)
         sim_debug(myDisk->debugmask, myDisk->device, "start of track %d at file offset %ld\n", myDisk->ntracks, ftell(myDisk->file));
 
         hdrBytes = sim_fread(&imd, 1, 5, myDisk->file);
-  
+
         if ((hdrBytes == 0) && feof(myDisk->file))
             break; /* detected end of IMD file */
 
@@ -672,7 +672,7 @@ t_stat sectWrite(DISK_INFO *myDisk,
  * does not involve changing the disk image size.)
  *
  * Any existing data on the disk image will be destroyed when Track 0, Head 0 is formatted.
- * At that time, the IMD file is truncated.  So for the trackWrite to be used to sucessfully
+ * At that time, the IMD file is truncated.  So for the trackWrite to be used to successfully
  * format a disk image, then format program must format tracks starting with Cyl 0, Head 0,
  * and proceed sequentially through all tracks/heads on the disk.
  *
diff --git a/sim_printf_fmts.h b/sim_printf_fmts.h
index 14f9eca..e313893 100644
--- a/sim_printf_fmts.h
+++ b/sim_printf_fmts.h
@@ -2,7 +2,7 @@
  * sim_printf_fmts.h
  *
  * Cross-platform printf() formats for simh data types. Refactored out to
- * this header so that these formats are avaiable to more than SCP.
+ * this header so that these formats are available to more than SCP.
  *
  * Author: B. Scott Michel
  *
diff --git a/sim_rev.h b/sim_rev.h
index d2bec30..d54f7a1 100644
--- a/sim_rev.h
+++ b/sim_rev.h
@@ -45,8 +45,8 @@
 #endif
 
 /*
-  SIM__GIT_COMMMIT_ID is undefined when working with an 
-  archive (zip file or tar ball).  Use Git keyword subsitution
+  SIM__GIT_COMMMIT_ID is undefined when working with an
+  archive (zip file or tar ball).  Use Git keyword substitution
   to record the archive's commit id via the .gitattributes
   "export-subst".
  */
@@ -55,9 +55,9 @@
 
 /*
   The comment section below reflects the manual editing process which was in place
-  prior to the use of the git source control system on at https://gihub.com/simh/simh
+  prior to the use of the git source control system on at https://github.com/simh/simh
 
-  Details about all future fixes will be visible in the source control system's 
+  Details about all future fixes will be visible in the source control system's
   history.
 
 */
@@ -86,7 +86,7 @@ patch   date            module(s) and fix(es)
                           connected LANs
 
                         sim_tmxr.c:
-                        - made telnet option negotiation more reliable, VAX simulator now 
+                        - made telnet option negotiation more reliable, VAX simulator now
                           works with PuTTY as console (Mark Pizzolato)
 
                         h316_cpu.c:
@@ -147,7 +147,7 @@ patch   date            module(s) and fix(es)
 
                         hp2100_dp.c (Dave Bryan):
                         - Added CNTLR_TYPE cast to dp_settype
- 
+
                         hp2100_ds.c (Dave Bryan):
                         - Rewritten to use the MAC/ICD disc controller library
                         - ioIOO now notifies controller service of parameter output
@@ -178,21 +178,21 @@ patch   date            module(s) and fix(es)
 
                         hp2100_ms.c (Dave Bryan):
                         - Added CNTLR_TYPE cast to ms_settype
- 
+
                         hp2100_mt.c (Dave Bryan):
                         - Removed redundant MTAB_VUN from "format" MTAB entry
                         - Fixed command scanning error in mtcio ioIOO handler
 
                         hp2100_stddev.c (Dave Bryan):
                         - Add TBG as a logical name for the CLK device
- 
+
                         hp2100_sys.c (Dave Bryan):
                         - Deprecated DEVNO in favor of SC
                         - Added hp_setsc, hp_showsc functions to support SC modifier
                         - Added DA and dummy DC devices
                         - DMA channels renamed from 0,1 to 1,2 to match documentation
                         - Changed DIB access for revised signal model
- 
+
                         hp_disclib.c, hp_disclib.h (Dave Bryan)
                         - Created MAC/ICD disc controller library
 
@@ -229,7 +229,7 @@ patch   date            module(s) and fix(es)
                         - fixed misuse of & instead of && in Ea_ch (Michael Bloom)
 
                         pdp1_stddev.c:
-                        - fixed unitialized variable in tty output service (Michael Bloom)
+                        - fixed uninitialized variable in tty output service (Michael Bloom)
 
                         pdp10_fe.c:
                         - revised to use clock coscheduling
@@ -241,7 +241,7 @@ patch   date            module(s) and fix(es)
                         - fixed Qbus interrupts to treat all IO devices (except clock) as BR4
                         - fixed order of int_internal (Jordi Guillaumes i Pons)
 
-                        ppd11_rf.c
+                        pdp11_rf.c
                         - fixed bug in updating mem addr extension (Peter Schorn)
 
                         pdp11_rk.c:
@@ -254,7 +254,7 @@ patch   date            module(s) and fix(es)
                         - added RD32 support
 
                         pdp11_tq.c: (Mark Pizzolato)
-                        - set UNIT_SXC flag when a tape mark is encountered 
+                        - set UNIT_SXC flag when a tape mark is encountered
                           during forward motion read operations
                         - fixed logic which clears UNIT_SXC to check command modifier
                         - added CMF_WR flag to tq_cmf entry for OP_WTM
@@ -264,7 +264,7 @@ patch   date            module(s) and fix(es)
                         - added more debug output after positioning operations
                         - added textual display of the command being performed
                         - fixed comments about register addresses
-                        
+
                         pdp11_ts.c:
                         - fixed t_addr printouts for 64b big-endian systems (Mark Pizzolato)
 
@@ -278,34 +278,34 @@ patch   date            module(s) and fix(es)
 
                         pdp11_xq.c: (Mark Pizzolato)
                         - Fixed missing information from save/restore which
-                          caused operations to not complete correctly after 
+                          caused operations to not complete correctly after
                           a restore until the OS reset the controller.
                         - Added address conflict check during attach.
                         - Fixed loopback processing to correctly handle forward packets.
-                        - Fixed interrupt dispatch issue which caused delivered packets 
+                        - Fixed interrupt dispatch issue which caused delivered packets
                           (in and out) to sometimes not interrupt the CPU after processing.
-                        - Fixed the SCP visibile SA registers to always display the 
+                        - Fixed the SCP visible SA registers to always display the
                           ROM mac address, even after it is changed by SET XQ MAC=.
-                        - Added changes so that the Console DELQA diagnostic (>>>TEST 82) 
+                        - Added changes so that the Console DELQA diagnostic (>>>TEST 82)
                           will succeed.
                         - Added DELQA-T (aka DELQA Plus) device emulation support.
                         - Added dropped frame statistics to record when the receiver discards
                           received packets due to the receiver being disabled, or due to the
                           XQ device's packet receive queue being full.
                         - Fixed bug in receive processing when we're not polling.  This could
-                          cause receive processing to never be activated again if we don't 
-                          read all available packets via eth_read each time we get the 
+                          cause receive processing to never be activated again if we don't
+                          read all available packets via eth_read each time we get the
                           opportunity.
                         - Added the ability to Coalesce received packet interrupts.  This
-                          is enabled by SET XQ POLL=DELAY=nnn where nnn is a number of 
+                          is enabled by SET XQ POLL=DELAY=nnn where nnn is a number of
                           microseconds to delay the triggering of an interrupt when a packet
                           is received.
-                        - Added SET XQ POLL=DISABLE (aka SET XQ POLL=0) to operate without 
+                        - Added SET XQ POLL=DISABLE (aka SET XQ POLL=0) to operate without
                           polling for packet read completion.
                         - Changed the sanity and id timer mechanisms to use a separate timer
-                          unit so that transmit and recieve activities can be dealt with
+                          unit so that transmit and receive activities can be dealt with
                           by the normal xq_svc routine.
-                          Dynamically determine the timer polling rate based on the 
+                          Dynamically determine the timer polling rate based on the
                           calibrated tmr_poll and clk_tps values of the simulator.
                         - Enabled the SET XQ POLL to be meaningful if the simulator currently
                           doesn't support idling.
@@ -313,7 +313,7 @@ patch   date            module(s) and fix(es)
                           all debug output goes to the same place.
                         - Restored the call to xq_svc after all successful calls to eth_write
                           to allow receive processing to happen before the next event
-                          service time.  This must have been inadvertently commented out 
+                          service time.  This must have been inadvertently commented out
                           while other things were being tested.
 
                         pdp11_xu.c: (Mark Pizzolato)
@@ -328,7 +328,7 @@ patch   date            module(s) and fix(es)
                         pdp18b_stddev.c:
                         - added clock coscheduling
                         - revised TTI to use clock coscheduling and to fix perpetual CAF bug
-                        
+
                         pdp18b_ttx.c:
                         - revised to use clock coscheduling
 
@@ -342,7 +342,7 @@ patch   date            module(s) and fix(es)
                         - revised to use clock coscheduling and to fix perpetual CAF bug
 
                         pdp8_ttx.c:
-                        - revised to use clock cosheduling
+                        - revised to use clock coscheduling
 
                         pdp8_sys.c:
                         - added link to FPP
@@ -401,7 +401,7 @@ patch   date            module(s) and fix(es)
                         - decommitted MTAB_VAL
                         - fixed implementation of MTAB_NC
                         - fixed warnings in help printouts
-                        - fixed "SHOW DEVICE" with only one enabled unit (Dave Bryan)  
+                        - fixed "SHOW DEVICE" with only one enabled unit (Dave Bryan)
 
                         sim_tape.c:
                         - fixed signed/unsigned warning in sim_tape_set_fmt (Dave Bryan)
@@ -423,7 +423,7 @@ patch   date            module(s) and fix(es)
                         - Moved non-existent memory checks to WritePW
                         - Fixed mp_dms_jmp to accept lower bound, check write protection
                         - Corrected DMS violation register set conditions
-                        - Refefined ABORT to pass address, moved def to hp2100_cpu.h
+                        - Redefined ABORT to pass address, moved def to hp2100_cpu.h
                         - Combined dms and dms_io routines
                         - JSB to 0/1 with W5 out and fence = 0 erroneously causes MP abort
                         - Unified I/O slot dispatch by adding DIBs for CPU, MP, and DMA
@@ -449,7 +449,7 @@ patch   date            module(s) and fix(es)
                         - Updated mp_dms_jmp calling sequence
                         - Fixed DJP, SJP, and UJP jump target validation
                         - RVA/B conditionally updates dms_vr before returning value
-                        
+
                         hp2100_cpu3.c (Dave Bryan):
                         - Moved microcode function prototypes to hp2100_cpu1.h
                         - Removed option-present tests (now in UIG dispatchers)
@@ -506,7 +506,7 @@ patch   date            module(s) and fix(es)
                         hp2100_mt.c (Dave Bryan):
                         - Fixed missing flag after CLR command
                         - Moved write enable and format commands from MTD to MTC
-                        
+
                         hp2100_mux.c (Dave Bryan):
                         - SHOW MUX CONN/STAT with SET MUX DIAG is no longer disallowed
                         - Changed Telnet poll to connect immediately after reset or attach
@@ -744,7 +744,7 @@ patch   date            module(s) and fix(es)
                         - fixed declarations (Mark Pizzolato)
 
 
-   V3.7 revision history 
+   V3.7 revision history
 
   3     02-Sep-07       scp.c:
                         - fixed bug in SET THROTTLE command
@@ -771,7 +771,7 @@ patch   date            module(s) and fix(es)
 
                         sim_timer.c:
                         - fixed idle timer event selection algorithm
-  
+
                         h316_lp.c:
                         - fixed loss of last print line (Theo Engel)
 
@@ -827,7 +827,7 @@ patch   date            module(s) and fix(es)
                         - fixed to set "mux_rchp" when a line break is received
                         - fixed incorrect "odd_par" table values
                         - reversed test in "RCV_PAR" to return "LIL_PAR" on odd parity
-                        - rixed mux reset (ioCRS) to clear port parameters
+                        - fixed mux reset (ioCRS) to clear port parameters
                         - fixed to use PUT_DCH instead of PUT_CCH for data channel status
                         - added DIAG/TERM modifiers to implement diagnostic mode
 
@@ -1016,7 +1016,7 @@ patch   date            module(s) and fix(es)
                         - fixed operand order in EIS instructions (W.F.J. Mueller)
 
 
-   V3.6 revision history 
+   V3.6 revision history
 
   1     25-Jul-06       sim_console.c:
                         - implemented SET/SHOW PCHAR
@@ -1167,7 +1167,7 @@ patch   date            module(s) and fix(es)
                         - fixed POLYD, POLYG to not exit prematurely if arg = 0
                         - fixed POLYD, POLYG to do full 64b multiply
                         - fixed POLYF, POLYD, POLYG to remove truncation on add
-                        - fixed POLYF, POLYD, POLYG to mask mul reslt to 31b/63b/63b
+                        - fixed POLYF, POLYD, POLYG to mask mul result to 31b/63b/63b
                         - fixed fp add routine to test for zero via fraction
                           to support "denormal" argument from POLYF, POLYD, POLYG
                         - fixed bug in 32b floating multiply routine
@@ -1183,14 +1183,14 @@ patch   date            module(s) and fix(es)
                         - fixed ACBH to set cc's on result
                         - fixed POLYH to set R3 correctly
                         - fixed POLYH to not exit prematurely if arg = 0
-                        - fixed POLYH to mask mul reslt to 127b
+                        - fixed POLYH to mask mul result to 127b
                         - fixed fp add routine to test for zero via fraction
                           to support "denormal" argument from POLYH
                         - fixed EMODH to concatenate 15b of 16b extension
                         - fixed bug in reported VA on faulting cross-page write
 
 
-   V3.5 revision history 
+   V3.5 revision history
 
 patch   date            module(s) and fix(es)
 
@@ -1326,7 +1326,7 @@ patch   date            module(s) and fix(es)
 
                         vax_io.c: revised autoconfiguration algorithm and interface
 
-   V3.4 revision history 
+   V3.4 revision history
 
   0     01-May-04       scp.c:
                         - fixed ASSERT code
@@ -1364,7 +1364,7 @@ patch   date            module(s) and fix(es)
 
                         pdp11_tu.c: fixed error reporting
 
-   V3.3 revision history 
+   V3.3 revision history
 
   2     08-Mar-05       scp.c: added ASSERT command (Dave Bryan)
 
@@ -1546,7 +1546,7 @@ patch   date            module(s) and fix(es)
                         - TMK is cleared by new motion command, not DCLR
                         - DONE is set on data transfers, ATA on non data transfers
 
-                        pdp11_defs.h: 
+                        pdp11_defs.h:
                         - revised Unibus/Qbus DMA API's
                         - added CPU type and options flags
 
@@ -1582,7 +1582,7 @@ patch   date            module(s) and fix(es)
                         vax_defs.h:
                         - added octaword, compatibility mode support
 
-                        vax_moddefs.h: 
+                        vax_moddefs.h:
                         - revised Unibus/Qbus DMA API's
 
                         vax_cpu.c:
@@ -1616,7 +1616,7 @@ patch   date            module(s) and fix(es)
                         - split from vax_sys.c
                         - removed PTR, PTP
 
-   V3.2 revision history 
+   V3.2 revision history
 
   3     03-Sep-04       scp.c:
                         - added ECHO command (Dave Bryan)
@@ -1701,7 +1701,7 @@ patch   date            module(s) and fix(es)
                         - revised SR values to preserve SR<5:3>
 
                         hp2100_lps.c, hp2100_lpt.c: fixed timing
-                        
+
                         hp2100_dp.c: fixed interpretation of SR<0>
 
                         hp2100_dr.c: revised boot code to use IBL algorithm
@@ -1868,7 +1868,7 @@ patch   date            module(s) and fix(es)
 
                         pdp1_drm.c:
                         - added parallel drum support
-                        - fixed bug in serial drum instructin decoding
+                        - fixed bug in serial drum instruction decoding
 
                         pdp1_sys.c: added parallel drum support, mnemonics
 
@@ -1893,7 +1893,7 @@ patch   date            module(s) and fix(es)
                         pdp11_xq.c (Dave Hittner, Mark Pizzolato):
                         - fixed second controller interrupts
                         - fixed bugs in multicast and promiscuous setup
-  
+
                         pdp18b_cpu.c:
                         - added instruction history
                         - fixed PDP-4,-7,-9 autoincrement bug
@@ -1928,7 +1928,7 @@ patch   date            module(s) and fix(es)
                         - revised instruction decoding
                         - added instruction history
 
-   V3.0 revision history 
+   V3.0 revision history
 
   2     15-Sep-03       scp.c:
                         - fixed end-of-file problem in dep, idep
@@ -1940,7 +1940,7 @@ patch   date            module(s) and fix(es)
                         - added address switch functionality to PTR BOOT
 
                         pdp1_sys.c: added multibank capability to LOAD
-  
+
                         pdp18b_cpu.c:
                         - fixed priorities in PDP-15 API (PI between 3 and 4)
                         - fixed sign handling in PDP-15 unsigned mul/div
@@ -2429,7 +2429,7 @@ patch   date            module(s) and fix(es)
                         pdp11_cpu.c: fixed bugs (John Dundas)
                         - added special case for PS<15:12> = 1111 to MFPI
                         - removed special case from MTPI
-                        - added masking of relocation adds 
+                        - added masking of relocation adds
 
                         i1401_cpu.c:
                         - added multiply/divide
@@ -2446,7 +2446,7 @@ patch   date            module(s) and fix(es)
                         - changed LOG/NOLOG to SET LOG/NOLOG
                         - added SHOW LOG
                         - added SET VT/NOVT and SHOW VT for VT emulation
-  
+
                         sim_sock.h: changed VMS stropt.h include to ioctl.h
 
                         vax_cpu.c
@@ -2455,12 +2455,12 @@ patch   date            module(s) and fix(es)
                         - fixed register logging in autoincrement indexed
 
                         vax_stddev.c: added TODR powerup routine
-                        
+
                         vax_cpu1.c: fixed exception flows to clear trap request
 
   7     30-Apr-02       scp.c: fixed bug in clock calibration when (real) clock
                            jumps forward due too far (Jonathan Engdahl)
-  
+
                         pdp11_cpu.c: fixed bugs, added features (John Dundas
                            and Wolfgang Helbig)
                         - added HTRAP and BPOK to maintenance register
@@ -2469,7 +2469,7 @@ patch   date            module(s) and fix(es)
                         - fixed RTS SP, don't increment restored SP
                         - fixed TSTSET, write dst | 1 rather than prev R0 | 1
                         - fixed DIV, set N=0,Z=1 on div by zero (J11, 11/70)
-                        - fixed DIV, set set N=Z=0 on overfow (J11, 11/70)
+                        - fixed DIV, set set N=Z=0 on overflow (J11, 11/70)
                         - fixed ASH, ASHC, count = -32 used implementation-
                            dependent 32 bit right shift
                         - fixed illegal instruction test to detect 000010
@@ -2600,7 +2600,7 @@ patch   date            module(s) and fix(es)
                         - cleaned up volatile state for GNU C longjmp
 
                         pdp11_cpu.c: cleaned up declarations
-  
+
                         pdp11_rq.c: added RA-class disks
 
 4       17-Dec-01       pdp11_rq.c: added delayed processing of packets
diff --git a/sim_scsi.c b/sim_scsi.c
index bbb7a12..6103c2f 100644
--- a/sim_scsi.c
+++ b/sim_scsi.c
@@ -71,7 +71,7 @@
 #define KEY_ILLREQ      5                               /* illegal request */
 #define KEY_PROT        7                               /* data protect */
 #define KEY_BLANK       8                               /* blank check */
-#define KEY_M_ILI       0x20                            /* incorrent length indicator */
+#define KEY_M_ILI       0x20                            /* incorrect length indicator */
 
 /* Additional sense codes */
 
@@ -380,7 +380,7 @@ scsi_debug_cmd (bus, "Test Unit Ready\n");
 
 if (uptr->flags & UNIT_ATT)                             /* attached? */
     scsi_status (bus, STS_OK, KEY_OK, ASC_OK);          /* unit is ready */
-else  
+else
     scsi_status (bus, STS_CHK, KEY_NOTRDY, ASC_NOMEDIA); /* no media present */
 }
 
@@ -428,11 +428,11 @@ else {
         }
 #endif
     if (dev->removeable)
-        bus->buf[bus->buf_b++] = 0x80;                  /* removeable */
+        bus->buf[bus->buf_b++] = 0x80;                  /* removable */
     else
         bus->buf[bus->buf_b++] = 0;                     /* fixed */
     bus->buf[bus->buf_b++] = dev->scsiver;              /* versions */
-    bus->buf[bus->buf_b++] = dev->scsiver;              /* respose data format */
+    bus->buf[bus->buf_b++] = dev->scsiver;              /* response data format */
     bus->buf[bus->buf_b++] = 31;                        /* additional length */
     bus->buf[bus->buf_b++] = 0;                         /* reserved */
     bus->buf[bus->buf_b++] = 0;                         /* reserved */
@@ -639,7 +639,7 @@ if ((pc == 0x4) || (pc == 0x3F)) {
     bus->buf[bus->buf_b++] = 0x4;                       /* landing zone cyl (15:8) */
     bus->buf[bus->buf_b++] = 0;                         /* landing zone cyl (7:0) */
     bus->buf[bus->buf_b++] = 0;                         /* reserved, RPL */
-    bus->buf[bus->buf_b++] = 0;                         /* rotational offet */
+    bus->buf[bus->buf_b++] = 0;                         /* rotational offset */
     bus->buf[bus->buf_b++] = 0;                         /* reserved */
     bus->buf[bus->buf_b++] = 0x1C;                      /* medium rotation rate (15:8) */
     bus->buf[bus->buf_b++] = 0x20;                      /* medium rotation rate (7:0) */
@@ -1189,7 +1189,7 @@ for (i = 0; i < sects; i++) {
     r = sim_tape_wrtmk (uptr);
     if (r != MTSE_OK) break;
     }
-    
+
 scsi_tape_status (bus, r);
 bus->buf[bus->buf_b++] = bus->status;                   /* status code */
 scsi_set_phase (bus, SCSI_STS);                         /* status phase next */
@@ -1782,7 +1782,7 @@ t_stat scsi_attach (UNIT *uptr, CONST char *cptr)
 return scsi_attach_ex (uptr, cptr, NULL);
 }
 
-/* Dettach device */
+/* Detach device */
 
 t_stat scsi_detach (UNIT *uptr)
 {
diff --git a/sim_serial.c b/sim_serial.c
index 9f68bbe..f7bf50a 100644
--- a/sim_serial.c
+++ b/sim_serial.c
@@ -74,12 +74,12 @@
    sim_control_serial (SERHANDLE port, int32 bits_to_set, int32 bits_to_clear, int32 *incoming_bits)
    -------------------------------------------------------------------------------------------------
 
-   The DTR and RTS line of the serial port is set or cleared as indicated in 
-   the respective bits_to_set or bits_to_clear parameters.  If the 
-   incoming_bits parameter is not NULL, then the modem status bits DCD, RNG, 
+   The DTR and RTS line of the serial port is set or cleared as indicated in
+   the respective bits_to_set or bits_to_clear parameters.  If the
+   incoming_bits parameter is not NULL, then the modem status bits DCD, RNG,
    DSR and CTS are returned.
 
-   If unreasonable or nonsense bits_to_set or bits_to_clear bits are 
+   If unreasonable or nonsense bits_to_set or bits_to_clear bits are
    specified, then the return status is SCPE_ARG;
    If an error occurs, SCPE_IOERR is returned.
 
@@ -233,8 +233,8 @@ static int sim_serial_devices (int max, SERIAL_LIST *list)
 {
 int i, j, ports = sim_serial_os_devices(max, list);
 
-/* Open ports may not show up in the list returned by sim_serial_os_devices 
-   so we add the open ports to the list removing duplicates before sorting 
+/* Open ports may not show up in the list returned by sim_serial_os_devices
+   so we add the open ports to the list removing duplicates before sorting
    the resulting list */
 
 for (i=0; i<serial_open_device_count; ++i) {
@@ -500,9 +500,9 @@ return r;
 
 /* Enumerate the available serial ports.
 
-   The serial port names are extracted from the appropriate place in the 
+   The serial port names are extracted from the appropriate place in the
    windows registry (HKLM\HARDWARE\DEVICEMAP\SERIALCOMM\).  The resulting
-   list is sorted alphabetically by device name (COMn).  The device description 
+   list is sorted alphabetically by device name (COMn).  The device description
    is set to the OS internal name for the COM device.
 
 */
@@ -536,7 +536,7 @@ if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\SERIALCOMM", 0, KEY_
             else
                 break;
             }
-        /* Besure to clear the working entry before trying again */
+        /* Be sure to clear the working entry before trying again */
         memset(list[ports].name, 0, sizeof(list[ports].name));
         memset(list[ports].desc, 0, sizeof(list[ports].desc));
         dwValueNameSize = sizeof(list[ports].desc);
@@ -775,12 +775,12 @@ return SCPE_OK;                                         /* return success status
 
 /* Control a serial port.
 
-   The DTR and RTS line of the serial port is set or cleared as indicated in 
-   the respective bits_to_set or bits_to_clear parameters.  If the 
-   incoming_bits parameter is not NULL, then the modem status bits DCD, RNG, 
+   The DTR and RTS line of the serial port is set or cleared as indicated in
+   the respective bits_to_set or bits_to_clear parameters.  If the
+   incoming_bits parameter is not NULL, then the modem status bits DCD, RNG,
    DSR and CTS are returned.
 
-   If unreasonable or nonsense bits_to_set or bits_to_clear bits are 
+   If unreasonable or nonsense bits_to_set or bits_to_clear bits are
    specified, then the return status is SCPE_ARG;
    If an error occurs, SCPE_IOERR is returned.
 */
@@ -939,8 +939,8 @@ struct SERPORT {
 
    The serial port names generated by attempting to open /dev/ttyS0 thru
    /dev/ttyS63 and /dev/ttyUSB0 thru /dev/ttyUSB63 and /dev/tty.serial0
-   thru /dev/tty.serial63.  Ones we can open and are ttys (as determined 
-   by isatty()) are added to the list.  The list is sorted alphabetically 
+   thru /dev/tty.serial63.  Ones we can open and are ttys (as determined
+   by isatty()) are added to the list.  The list is sorted alphabetically
    by device name.
 
 */
@@ -1002,7 +1002,7 @@ for (i=0; (ports < max) && (i < 64); ++i) {
 static char *serial_unix_serial_names[] = { "S", "U", "USB", ".serial", ".usbserial", NULL};
 char **sp;
 
-for (sp = serial_unix_serial_names; *sp; sp++) { 
+for (sp = serial_unix_serial_names; *sp; sp++) {
     for (i=0; (ports < max) && (i <= 64); ++i) {
         if (i < 64)
             snprintf (list[ports].name, sizeof (list[ports].name), "/dev/tty%s%d", *sp, i);
@@ -1224,12 +1224,12 @@ return SCPE_OK;                                         /* configuration set suc
 
 /* Control a serial port.
 
-   The DTR and RTS line of the serial port is set or cleared as indicated in 
-   the respective bits_to_set or bits_to_clear parameters.  If the 
-   incoming_bits parameter is not NULL, then the modem status bits DCD, RNG, 
+   The DTR and RTS line of the serial port is set or cleared as indicated in
+   the respective bits_to_set or bits_to_clear parameters.  If the
+   incoming_bits parameter is not NULL, then the modem status bits DCD, RNG,
    DSR and CTS are returned.
 
-   If unreasonable or nonsense bits_to_set or bits_to_clear bits are 
+   If unreasonable or nonsense bits_to_set or bits_to_clear bits are
    specified, then the return status is SCPE_ARG;
    If an error occurs, SCPE_IOERR is returned.
 */
@@ -1432,7 +1432,7 @@ struct SERPORT {
 
    The serial port names generated by attempting to open /dev/ttyS0 thru
    /dev/ttyS53 and /dev/ttyUSB0 thru /dev/ttyUSB0.  Ones we can open and
-   are ttys (as determined by isatty()) are added to the list.  The list 
+   are ttys (as determined by isatty()) are added to the list.  The list
    is sorted alphabetically by device name.
 
 */
@@ -1539,10 +1539,10 @@ SERHANDLE port;
 
 devnam.dsc$w_length = strlen (devnam.dsc$a_pointer);
 status = sys$assign (&devnam, &chan, 0, 0);
-if (status != SS$_NORMAL) 
+if (status != SS$_NORMAL)
     return INVALID_HANDLE;
 status = sys$getdviw (0, chan, NULL, items, &iosb, NULL, 0, NULL);
-if ((status != SS$_NORMAL)      || 
+if ((status != SS$_NORMAL)      ||
     (iosb.status != SS$_NORMAL) ||
     (devclass != DC$_TERM)) {
     sys$dassgn (chan);
@@ -1671,12 +1671,12 @@ return SCPE_OK;                                         /* configuration set suc
 
 /* Control a serial port.
 
-   The DTR and RTS line of the serial port is set or cleared as indicated in 
-   the respective bits_to_set or bits_to_clear parameters.  If the 
-   incoming_bits parameter is not NULL, then the modem status bits DCD, RNG, 
+   The DTR and RTS line of the serial port is set or cleared as indicated in
+   the respective bits_to_set or bits_to_clear parameters.  If the
+   incoming_bits parameter is not NULL, then the modem status bits DCD, RNG,
    DSR and CTS are returned.
 
-   If unreasonable or nonsense bits_to_set or bits_to_clear bits are 
+   If unreasonable or nonsense bits_to_set or bits_to_clear bits are
    specified, then the return status is SCPE_ARG;
    If an error occurs, SCPE_IOERR is returned.
 */
@@ -1770,7 +1770,7 @@ if (status != SS$_NORMAL) {
     }
 if (sense.sense_count == 0)                                 /* no characters available? */
     return 0;                                               /* return 0 to indicate */
-status = sys$qiow (0, port->port, IO$_READLBLK | IO$M_NOECHO | IO$M_NOFILTR | IO$M_TIMED | IO$M_TRMNOECHO, 
+status = sys$qiow (0, port->port, IO$_READLBLK | IO$M_NOECHO | IO$M_NOFILTR | IO$M_TIMED | IO$M_TRMNOECHO,
                    &iosb, 0, 0, buffer, (count < sense.sense_count) ? count : sense.sense_count, 0, term, 0, 0);
 if (status == SS$_NORMAL)
     status = iosb.status;
diff --git a/sim_sock.h b/sim_sock.h
index 1a0ee45..7ae40f5 100644
--- a/sim_sock.h
+++ b/sim_sock.h
@@ -23,10 +23,10 @@
    used in advertising or otherwise to promote the sale, use or other dealings
    in this Software without prior written authorization from Robert M Supnik.
 
-   15-Oct-12    MP      Added definitions needed to detect possible tcp 
+   15-Oct-12    MP      Added definitions needed to detect possible tcp
                         connect failures
    25-Sep-12    MP      Reworked for RFC3493 interfaces supporting IPv6 and IPv4
-   04-Jun-08    RMS     Addes sim_create_sock, for IBM 1130
+   04-Jun-08    RMS     Added sim_create_sock, for IBM 1130
    14-Apr-05    RMS     Added WSAEINPROGRESS (from Tim Riker)
    20-Aug-04    HV      Added missing definition for OS/2 (from Holger Veit)
    22-Oct-03    MP      Changed WIN32 winsock include to use winsock2.h to
@@ -69,7 +69,7 @@ extern "C" {
 
 #define WSAGetLastError()       errno                   /* Windows macros */
 #define WSASetLastError(err) errno = err
-#define closesocket     close 
+#define closesocket     close
 #define SOCKET          int
 #if defined(__hpux)
 #define WSAEWOULDBLOCK  EAGAIN
@@ -111,10 +111,10 @@ extern "C" {
 #define sim_printf printf
 #endif
 
-int sim_parse_addr (const char *cptr, char *host, size_t hostlen, const char *default_host, 
-                                      char *port, size_t port_len, const char *default_port, 
+int sim_parse_addr (const char *cptr, char *host, size_t hostlen, const char *default_host,
+                                      char *port, size_t port_len, const char *default_port,
                                       const char *validate_addr);
-int sim_parse_addr_ex (const char *cptr, char *host, size_t hostlen, const char *default_host, 
+int sim_parse_addr_ex (const char *cptr, char *host, size_t hostlen, const char *default_host,
                                          char *port, size_t port_len, char *localport, size_t local_port_len, const char *default_port);
 int sim_addr_acl_check (const char *validate_addr, const char *acl);
 #define SIM_SOCK_OPT_REUSEADDR      0x0001
diff --git a/sim_tape.c b/sim_tape.c
index 20347ff..450b98a 100644
--- a/sim_tape.c
+++ b/sim_tape.c
@@ -35,8 +35,8 @@
                             sim_tape_sprecsr    - skip records rev
                             sim_tape_spfiler    - skip files rev
                             sim_tape_position   - general purpose position
-                        These routines correspond to natural tape operations 
-                        and will align better when physical tape support is 
+                        These routines correspond to natural tape operations
+                        and will align better when physical tape support is
                         included here.
    08-Jun-08    JDB     Fixed signed/unsigned warning in sim_tape_set_fmt
    23-Jan-07    JDB     Fixed backspace over gap at BOT
@@ -71,7 +71,7 @@
    sim_tape_errecf      erase record forward
    sim_tape_errecr      erase record reverse
    sim_tape_sprecsf     space records forward
-   sim_tape_spfilef     space files forward 
+   sim_tape_spfilef     space files forward
    sim_tape_sprecsr     space records reverse
    sim_tape_spfiler     space files reverse
    sim_tape_position    generalized position
@@ -229,8 +229,8 @@ _tape_io(void *arg)
 UNIT* volatile uptr = (UNIT*)arg;
 struct tape_context *ctx = (struct tape_context *)uptr->tape_ctx;
 
-    /* Boost Priority for this I/O thread vs the CPU instruction execution 
-       thread which in general won't be readily yielding the processor when 
+    /* Boost Priority for this I/O thread vs the CPU instruction execution
+       thread which in general won't be readily yielding the processor when
        this thread needs to run */
     sim_os_set_thread_priority (PRIORITY_ABOVE_NORMAL);
 
@@ -308,14 +308,14 @@ struct tape_context *ctx = (struct tape_context *)uptr->tape_ctx;
     return NULL;
 }
 
-/* This routine is called in the context of the main simulator thread before 
-   processing events for any unit. It is only called when an asynchronous 
-   thread has called sim_activate() to activate a unit.  The job of this 
+/* This routine is called in the context of the main simulator thread before
+   processing events for any unit. It is only called when an asynchronous
+   thread has called sim_activate() to activate a unit.  The job of this
    routine is to put the unit in proper condition to digest what may have
    occurred in the asynchronous thread.
-   
-   Since tape processing only handles a single I/O at a time to a 
-   particular tape device, we have the opportunity to possibly detect 
+
+   Since tape processing only handles a single I/O at a time to a
+   particular tape device, we have the opportunity to possibly detect
    improper attempts to issue multiple concurrent I/O requests. */
 static void _tape_completion_dispatch (UNIT *uptr)
 {
@@ -453,30 +453,30 @@ typedef struct MEMORY_TAPE {
     VOL1 vol1;
     } MEMORY_TAPE;
 
-const char HDR3_RMS_STREAM[] = "HDR3020002040000" 
-                               "0000000100000000" 
-                               "0000000002000000" 
-                               "0000000000000000" 
+const char HDR3_RMS_STREAM[] = "HDR3020002040000"
+                               "0000000100000000"
+                               "0000000002000000"
+                               "0000000000000000"
                                "0000            ";
-const char HDR3_RMS_STMLF[] =  "HDR3020002050000" 
-                               "0000000100000000" 
-                               "0000000002000000" 
-                               "0000000000000000" 
+const char HDR3_RMS_STMLF[] =  "HDR3020002050000"
+                               "0000000100000000"
+                               "0000000002000000"
+                               "0000000000000000"
                                "0000            ";
-const char HDR3_RMS_FIXED[] =  "HDR3020000010000" 
-                               "0000000100000000" 
-                               "0000000002000000" 
-                               "0000000000000000" 
+const char HDR3_RMS_FIXED[] =  "HDR3020000010000"
+                               "0000000100000000"
+                               "0000000002000000"
+                               "0000000000000000"
                                "0000            ";
-const char HDR3_RMS_VARRSX[] = "HDR300000A020000" 
-                               "0000000100000000" 
-                               "0000000000000000" 
-                               "0000000000000000" 
+const char HDR3_RMS_VARRSX[] = "HDR300000A020000"
+                               "0000000100000000"
+                               "0000000000000000"
+                               "0000000000000000"
                                "0000            ";
-const char HDR3_RMS_FIXRSX[] = "HDR3020008010000" 
-                               "0000000100000000" 
-                               "0000000000000000" 
-                               "0000000000000000" 
+const char HDR3_RMS_FIXRSX[] = "HDR3020008010000"
+                               "0000000100000000"
+                               "0000000000000000"
+                               "0000000000000000"
                                "0000            ";
 
 static struct ansi_tape_parameters {
@@ -508,7 +508,7 @@ static struct ansi_tape_parameters {
 static MEMORY_TAPE *ansi_create_tape (const char *label, size_t block_size, uint32 ansi_type);
 static MEMORY_TAPE *memory_create_tape (void);
 static void memory_free_tape (void *vtape);
-static void sim_tape_add_ansi_entry (const char *directory, 
+static void sim_tape_add_ansi_entry (const char *directory,
                                      const char *filename,
                                      t_offset FileSize,
                                      const struct stat *filestat,
@@ -596,7 +596,7 @@ return SCPE_OK;
 #endif
 }
 
-/* 
+/*
    This routine is called when the simulator stops and any time
    the asynch mode is changed (enabled or disabled)
 */
@@ -781,7 +781,7 @@ switch (MT_GET_FMT (uptr)) {
                 if (uptr->recsize == 0)
                     uptr->recsize = 512;
                 if ((statb.st_size % uptr->recsize) != 0) {
-                    r = sim_messagef (SCPE_ARG, "Binary file data is not a multiple of the specifyed record size (%d)\n", (int)uptr->recsize);
+                    r = sim_messagef (SCPE_ARG, "Binary file data is not a multiple of the specified record size (%d)\n", (int)uptr->recsize);
                     fclose (f);
                     break;
                     }
@@ -810,11 +810,11 @@ switch (MT_GET_FMT (uptr)) {
                 tape->block_size = uptr->recsize;
                 block = (uint8 *)calloc (1, tape->block_size + 3);
                 while (!feof (f) && !error) {
-                    /* fgest() read size is int, cast accordingly. */
+                    /* fgets() read size is int, cast accordingly. */
                     if (fgets ((char *)block, (int) (tape->block_size + 3), f)) {
                         size_t len = strlen ((char *)block);
 
-                        while ((len > 0) && 
+                        while ((len > 0) &&
                                ((block[len - 1] == '\r') || (block[len - 1] == '\n')))
                             --len;
                         memset (block + len, ' ', tape->block_size - len);
@@ -891,7 +891,7 @@ switch (MT_GET_FMT (uptr)) {
         if (uptr->recsize == 0)
             uptr->recsize = TAR_DFLT_RECSIZE;           /* Apply default block size */
         if ((uptr->recsize % 512) != 0)
-            return sim_messagef (SCPE_ARG, "TAR format block size of %" SIZE_T_FMT "u is not a multiple of 512\n", uptr->recsize); 
+            return sim_messagef (SCPE_ARG, "TAR format block size of %" SIZE_T_FMT "u is not a multiple of 512\n", uptr->recsize);
         sim_switches |= SWMASK ('E');                   /* The TAR file must exist */
         /* fall through */
     default:
@@ -1083,7 +1083,7 @@ fprintf (st, "        accessible directly as files on the tape.\n\n");
 fprintf (st, "        FIXED format will present the contents of a file (text or binary) as\n");
 fprintf (st, "        fixed sized records/blocks with ascii text data optionally converted\n");
 fprintf (st, "        to EBCDIC.\n\n");
-fprintf (st, "        DOS11 format will present the contents of a file preceeded by a DOS11\n");
+fprintf (st, "        DOS11 format will present the contents of a file preceded by a DOS11\n");
 fprintf (st, "        14-byte header. All files will be owned by [1,1], have a default\n");
 fprintf (st, "        protection of <233> and a date in the range 1972 - 1999 with the\n");
 fprintf (st, "        month/day layout as the current year. The file name on the tape\n");
@@ -1239,7 +1239,7 @@ MT_CLR_PNU (uptr);                                      /* clear the position-no
 if ((uptr->flags & UNIT_ATT) == 0)                      /* if the unit is not attached */
     return MTSE_UNATT;                                  /*   then quit with an error */
 
-if ((uptr->tape_eom > 0) && 
+if ((uptr->tape_eom > 0) &&
     (uptr->pos >= uptr->tape_eom)) {
     MT_SET_PNU (uptr);                                  /*   then set position not updated */
     return MTSE_EOM;                                    /*     and quit with I/O error status */
@@ -1402,7 +1402,7 @@ switch (f) {                                       /* otherwise the read method
             }
         else {
             if ((feof (uptr->fileref)) ||               /* eof? */
-                ((tpcbc == TPC_EOM) && 
+                ((tpcbc == TPC_EOM) &&
                  (sim_fsize (uptr->fileref) == (uint32)sim_ftell (uptr->fileref)))) {
                 MT_SET_PNU (uptr);                      /* pos not upd */
                 status = MTSE_EOM;
@@ -1483,7 +1483,7 @@ switch (f) {                                       /* otherwise the read method
         saved_pos = (t_addr)sim_ftell (uptr->fileref);/* save record data address */
         (void)sim_tape_seek (uptr, uptr->pos); /* for read */
         rdcnt = sim_fread (&awshdr, sizeof (t_awslnt), 3, uptr->fileref);
-        if ((rdcnt == 3) && 
+        if ((rdcnt == 3) &&
             ((awshdr.prelen != *bc) || ((awshdr.rectyp != AWS_REC) && (awshdr.rectyp != AWS_TMK)))) {
             status = MTSE_INVRL;
             uptr->tape_eom = uptr->pos;
@@ -1499,7 +1499,7 @@ switch (f) {                                       /* otherwise the read method
                 *bc = (t_mtrlnt)uptr->recsize;              /* TAR record size */
             else
                 *bc = (t_mtrlnt)(uptr->hwmark - uptr->pos); /* TAR remnant last record */
-            (void)sim_tape_seek (uptr, uptr->pos); 
+            (void)sim_tape_seek (uptr, uptr->pos);
             uptr->pos += *bc;
             MT_CLR_INMRK (uptr);
             }
@@ -1798,8 +1798,8 @@ switch (f) {                                            /* otherwise the read me
                 status = MTSE_EOM;
                 break;
                 }
-            if ((rdcnt != 3) || 
-                ((awshdr.rectyp != AWS_REC) && 
+            if ((rdcnt != 3) ||
+                ((awshdr.rectyp != AWS_REC) &&
                  (awshdr.rectyp != AWS_TMK))) {
                 status = MTSE_INVRL;
                 }
@@ -1810,8 +1810,8 @@ switch (f) {                                            /* otherwise the read me
         if (awshdr.prelen == 0)
             status = MTSE_TMK;
         else {
-            if ((uptr->tape_eom > 0) && 
-                (uptr->pos >= uptr->tape_eom) && 
+            if ((uptr->tape_eom > 0) &&
+                (uptr->pos >= uptr->tape_eom) &&
                 (awshdr.rectyp == AWS_TMK)) {
                 status = MTSE_TMK;
                 *bc = 0;                                /* save rec lnt */
@@ -1847,7 +1847,7 @@ switch (f) {                                            /* otherwise the read me
              *bc = (t_mtrlnt)uptr->recsize;
          if (*bc) {
              uptr->pos -= *bc;
-             (void)sim_tape_seek (uptr, uptr->pos); 
+             (void)sim_tape_seek (uptr, uptr->pos);
              }
         break;
 
@@ -2139,7 +2139,7 @@ if (ferror (uptr->fileref)) {               /* error? */
     MT_SET_PNU (uptr);                      /* pos not upd */
     return sim_tape_ioerr (uptr);
     }
-if ((!sim_tape_bot (uptr)) && 
+if ((!sim_tape_bot (uptr)) &&
     (((feof (uptr->fileref)) && (rdcnt < 3)) || /* eof? */
      ((awshdr.rectyp != AWS_REC) && (awshdr.rectyp != AWS_TMK)))) {
     MT_SET_PNU (uptr);                      /* pos not upd */
@@ -2870,7 +2870,7 @@ if (ctx == NULL)                                        /* if not properly attac
     return sim_messagef (SCPE_IERR, "Bad Attach\n");    /*   that's a problem */
 sim_debug_unit (ctx->dbit, uptr, "sim_tape_sprecsf(unit=%d, count=%d)\n", (int)(uptr-ctx->dptr->units), count);
 
-while (*skipped < count) {                              /* loopo */
+while (*skipped < count) {                              /* loop */
     st = sim_tape_sprecf (uptr, &tbc);                  /* spc rec */
     if (st != MTSE_OK)
         return st;
@@ -2967,7 +2967,7 @@ if (ctx == NULL)                                        /* if not properly attac
     return sim_messagef (SCPE_IERR, "Bad Attach\n");    /*   that's a problem */
 sim_debug_unit (ctx->dbit, uptr, "sim_tape_sprecsr(unit=%d, count=%d)\n", (int)(uptr-ctx->dptr->units), count);
 
-while (*skipped < count) {                              /* loopo */
+while (*skipped < count) {                              /* loop */
     st = sim_tape_sprecr (uptr, &tbc);                  /* spc rec rev */
     if (st != MTSE_OK)
         return st;
@@ -3028,7 +3028,7 @@ if (check_leot) {
     }
 *skipped = 0;
 *recsskipped = 0;
-while (*skipped < count) {                              /* loopo */
+while (*skipped < count) {                              /* loop */
     while (1) {
         st = sim_tape_sprecsf (uptr, 0x1ffffff, &filerecsskipped);/* spc recs */
         *recsskipped += filerecsskipped;
@@ -3134,7 +3134,7 @@ if (ctx == NULL)                                        /* if not properly attac
     return sim_messagef (SCPE_IERR, "Bad Attach\n");    /*   that's a problem */
 sim_debug_unit (ctx->dbit, uptr, "sim_tape_spfilebyrecr(unit=%d, count=%d)\n", (int)(uptr-ctx->dptr->units), count);
 
-while (*skipped < count) {                              /* loopo */
+while (*skipped < count) {                              /* loop */
     while (1) {
         st = sim_tape_sprecsr (uptr, 0x1ffffff, &filerecsskipped);/* spc recs rev */
         *recsskipped += filerecsskipped;
@@ -3250,7 +3250,7 @@ if (flags & MTPOS_M_OBJ) {
     uint32 skipped;
     uint32 objsremaining = objs;
 
-    while (*objectsskipped < objs) {                       /* loopo */
+    while (*objectsskipped < objs) {                       /* loop */
         if (flags & MTPOS_M_REV)                        /* reverse? */
             r = sim_tape_sprecsr (uptr, objsremaining, &skipped);
         else
@@ -3445,18 +3445,18 @@ for (i=0; i<65535; i++) {
             sim_debug_unit (MTSE_DBG_STR, uptr, "tpc_map: summary - %u %d byte record%s\n", countmap[i], (int)i, (countmap[i] > 1) ? "s" : "");
         }
     }
-if (((last_bc != TPC_EOM) && 
+if (((last_bc != TPC_EOM) &&
      (tpos > tape_size) &&
      (!had_double_tape_mark))    ||
     (!had_double_tape_mark)      ||
-    ((objc == countmap[0]) && 
+    ((objc == countmap[0]) &&
      (countmap[0] != 2))) {     /* Unreasonable format? */
     if (last_bc != TPC_EOM)
         sim_debug_unit (MTSE_DBG_STR, uptr, "tpc_map: ERROR unexpected EOT byte count: %d\n", last_bc);
     if (tpos > tape_size)
         sim_debug_unit (MTSE_DBG_STR, uptr, "tpc_map: ERROR next record position %" T_ADDR_FMT "u beyond EOT: %" T_ADDR_FMT "u\n", tpos, tape_size);
     if (objc == countmap[0])
-        sim_debug_unit (MTSE_DBG_STR, uptr, "tpc_map: ERROR tape cnly contains tape marks\n");
+        sim_debug_unit (MTSE_DBG_STR, uptr, "tpc_map: ERROR tape only contains tape marks\n");
     free (countmap);
     free (recbuf);
     return 0;
@@ -3582,7 +3582,7 @@ while (r == SCPE_OK) {
             break;
             }
         if (0 != memcmp (buf_f, buf_r, bc_f)) {
-            sim_printf ("%d byte record contents differ when read forward amd backwards start from position %" T_ADDR_FMT "u\n", bc_f, pos_f);
+            sim_printf ("%d byte record contents differ when read forward and backwards start from position %" T_ADDR_FMT "u\n", bc_f, pos_f);
             r = MTSE_RECE;
             break;
             }
@@ -3817,11 +3817,11 @@ return SCPE_OK;
 
 /* list supported densities
 
-   translates the mask of supported densities to a string list in the form: 
-   
+   translates the mask of supported densities to a string list in the form:
+
            "(800|1600|6250)"
 
-   this string may be useful to construct a MTAB help string for a 
+   this string may be useful to construct a MTAB help string for a
    SET <unit> DENSITY= command.
 
 */
@@ -4076,7 +4076,7 @@ tpclnt = 0xffff;
 (void)sim_fwrite (&mtrlnt, sizeof (mtrlnt), 1, fE11);
 (void)sim_fwrite (&tpclnt, sizeof (tpclnt), 1, fTPC);
 (void)sim_fwrite (buf, 1, 1, fP7B);
-/* Write an unmatched record delimiter (aka garbage) at 
+/* Write an unmatched record delimiter (aka garbage) at
    the end of the SIMH, E11 and AWS files */
 mtrlnt = 25;
 (void)sim_fwrite (&mtrlnt, sizeof (mtrlnt), 1, fSIMH);
@@ -4220,23 +4220,23 @@ if ((SCPE_ARG != (stat = sim_tape_density_supported (buf, sizeof (buf), valid_bi
     (strcmp (buf, "")))
     return stat;
 valid_bits = MT_556_VALID;
-if ((SCPE_OK != (stat = sim_tape_density_supported (buf, sizeof (buf), valid_bits))) || 
+if ((SCPE_OK != (stat = sim_tape_density_supported (buf, sizeof (buf), valid_bits))) ||
     (strcmp (buf, "556")))
     return sim_messagef (SCPE_ARG, "stat was: %s, got string: %s\n", sim_error_text (stat), buf);
 valid_bits = MT_800_VALID | MT_1600_VALID;
-if ((SCPE_OK != (stat = sim_tape_density_supported (buf, sizeof (buf), valid_bits))) || 
+if ((SCPE_OK != (stat = sim_tape_density_supported (buf, sizeof (buf), valid_bits))) ||
     (strcmp (buf, "{800|1600}")))
     return sim_messagef (SCPE_ARG, "stat was: %s, got string: %s\n", sim_error_text (stat), buf);
 valid_bits = MT_800_VALID | MT_1600_VALID | MT_6250_VALID;
-if ((SCPE_OK != (stat = sim_tape_density_supported (buf, sizeof (buf), valid_bits))) || 
+if ((SCPE_OK != (stat = sim_tape_density_supported (buf, sizeof (buf), valid_bits))) ||
     (strcmp (buf, "{800|1600|6250}")))
     return sim_messagef (SCPE_ARG, "stat was: %s, got string: %s\n", sim_error_text (stat), buf);
 valid_bits = MT_200_VALID | MT_800_VALID | MT_1600_VALID | MT_6250_VALID;
-if ((SCPE_OK != (stat = sim_tape_density_supported (buf, sizeof (buf), valid_bits))) || 
+if ((SCPE_OK != (stat = sim_tape_density_supported (buf, sizeof (buf), valid_bits))) ||
     (strcmp (buf, "{200|800|1600|6250}")))
     return sim_messagef (SCPE_ARG, "stat was: %s, got string: %s\n", sim_error_text (stat), buf);
 valid_bits = MT_NONE_VALID | MT_800_VALID | MT_1600_VALID | MT_6250_VALID;
-if ((SCPE_OK != (stat = sim_tape_density_supported (buf, sizeof (buf), valid_bits))) || 
+if ((SCPE_OK != (stat = sim_tape_density_supported (buf, sizeof (buf), valid_bits))) ||
     (strcmp (buf, "{0|800|1600|6250}")))
     return sim_messagef (SCPE_ARG, "stat was: %s, got string: %s\n", sim_error_text (stat), buf);
 return SCPE_OK;
@@ -4299,7 +4299,7 @@ for (t = classify_tests; t->testname != NULL; t++) {
     tape_classify_file_contents (f, &mrs, &lf_lines, &crlf_lines);
     fclose (f);
     if ((mrs != t->expected_mrs) || (lf_lines != t->expected_lf_lines) || (crlf_lines != t->expected_crlf_lines))
-        return sim_messagef (SCPE_ARG, "%s was unexpectedly reported to having MRS=%d, lf_lines=%s, crlf_lines=%s\n", 
+        return sim_messagef (SCPE_ARG, "%s was unexpectedly reported to having MRS=%d, lf_lines=%s, crlf_lines=%s\n",
                                        t->testname, (int)mrs, lf_lines ? "true" : "false", crlf_lines ? "true" : "false");
     if (t->success_attach_args) {
         char args[CBUFSIZE*2];
@@ -4414,17 +4414,17 @@ static void ansi_date (time_t datetime, char date[6], t_bool y2k_date_bug)
 
     lt = localtime (&datetime);
     if (y2k_date_bug)
-        sprintf (buf, " %c%c%03d", '0' + (lt->tm_year / 10), 
-                                   '0' + (lt->tm_year % 10), 
+        sprintf (buf, " %c%c%03d", '0' + (lt->tm_year / 10),
+                                   '0' + (lt->tm_year % 10),
                                    lt->tm_yday + 1);
     else
-        sprintf (buf, "%c%02d%03d", (lt->tm_year < 100) ? ' ' : '0' + (lt->tm_year/100 - 1), 
-                                    lt->tm_year % 100, 
+        sprintf (buf, "%c%02d%03d", (lt->tm_year < 100) ? ' ' : '0' + (lt->tm_year/100 - 1),
+                                    lt->tm_year % 100,
                                     lt->tm_yday + 1);
     memcpy (date, buf, 6);
     }
 
-/* 
+/*
  * This isn't quite ANSI 'a' since several ANSI allowed characters
  * are either illegal file names on many DEC systems or are confusing
  * to OS file name parsers.
@@ -4479,7 +4479,7 @@ static void ansi_make_HDR1 (HDR1 *hdr1, VOL1 *vol, HDR4 *hdr4, const char *filen
     fn = fn_cpy;
     ext = strrchr (fn_cpy, '.');
     if (ext) {
-        while (((c = strchr (fn_cpy, '.')) != NULL) && 
+        while (((c = strchr (fn_cpy, '.')) != NULL) &&
                (c != ext))
             *c = '_';                              /* translate extra .'s to _ */
         }
@@ -4565,7 +4565,7 @@ static void ansi_fill_text_buffer (FILE *f, char *buf, size_t buf_size, size_t r
                 move_size = rec_size;
             else
                 move_size = buf_size - offset;
-            /* We've got a line that stradles a block boundary */
+            /* We've got a line that straddles a block boundary */
             memcpy (buf + offset, tmp, move_size);
             offset += move_size;
             if (offset == buf_size) {
@@ -4798,7 +4798,7 @@ else {
         if (data_read > 0)
             error = memory_tape_add_block (tape, block, data_read);
         }
-    } 
+    }
 
 fclose (f);
 free (block);
@@ -4953,7 +4953,7 @@ else {                                                  /* Text file */
                                                1 - ansi->skip_lf_line_endings);
         /* max_record_size must fit in the 4-character ANSI RCW */
         if (max_record_size > 9999) {
-            size_t max_allowed = 9999 - 4 - 
+            size_t max_allowed = 9999 - 4 -
                                  (crlf_line_endings ? 2 - ansi->skip_crlf_line_endings :
                                                       1 - ansi->skip_lf_line_endings);
             sim_messagef (SCPE_ARG, "Text file: %s has lines longer (%d) than %s format allows (%d)\n",
@@ -5002,15 +5002,15 @@ while (!feof (f) && !error) {
     size_t data_read = tape->block_size;
 
     if (lf_line_endings || crlf_line_endings)           /* Text file? */
-        ansi_fill_text_buffer (f, (char *)block, tape->block_size, 
-                               crlf_line_endings ? ansi->skip_crlf_line_endings : ansi->skip_lf_line_endings, 
+        ansi_fill_text_buffer (f, (char *)block, tape->block_size,
+                               crlf_line_endings ? ansi->skip_crlf_line_endings : ansi->skip_lf_line_endings,
                                ansi->fixed_text);
 
     else {                                              /* Binary file */
         size_t runt = 0;
 
         data_read = fread (block, 1, tape->block_size, f);
-        if (max_record_size > 0)                /* always will be true but XCode thinks otherwise */
+        if (max_record_size > 0)                /* always will be true but Xcode thinks otherwise */
             runt = data_read % max_record_size; /* data_read (=0) % anypositivenumber == 0 */
         /* Pad short records with zeros */
         if (runt > 0) {
@@ -5049,7 +5049,7 @@ if (sim_switches & SWMASK ('V'))
 return error;
 }
 
-static void sim_tape_add_ansi_entry (const char *directory, 
+static void sim_tape_add_ansi_entry (const char *directory,
                                      const char *filename,
                                      t_offset FileSize,
                                      const struct stat *filestat,
diff --git a/sim_timer.c b/sim_timer.c
index 56a42e2..333d26a 100644
--- a/sim_timer.c
+++ b/sim_timer.c
@@ -32,23 +32,23 @@
                          - Sleep for the observed clock tick size while throttling
                          - Recompute the throttling wait once every 10 seconds
                            to account for varying instruction mixes during
-                           different phases of a simulator execution or to 
-                           accommodate the presence of other load on the host 
+                           different phases of a simulator execution or to
+                           accommodate the presence of other load on the host
                            system.
-                         - Each of the pre-existing throttling modes (Kcps, 
-                           Mcps, and %) all compute the appropriate throttling 
+                         - Each of the pre-existing throttling modes (Kcps,
+                           Mcps, and %) all compute the appropriate throttling
                            interval dynamically.  These dynamic computations
-                           assume that 100% of the host CPU is dedicated to 
+                           assume that 100% of the host CPU is dedicated to
                            the current simulator during this computation.
-                           This assumption may not always be true and under 
-                           certain conditions may never provide a way to 
-                           correctly determine the appropriate throttling 
+                           This assumption may not always be true and under
+                           certain conditions may never provide a way to
+                           correctly determine the appropriate throttling
                            wait.  An additional throttling mode has been added
                            which allows the simulator operator to explicitly
                            state the desired throttling wait parameters.
-                           These are specified by: 
+                           These are specified by:
                                   SET THROT insts/delay
-                           where 'insts' is the number of instructions to 
+                           where 'insts' is the number of instructions to
                            execute before sleeping for 'delay' milliseconds.
    22-Apr-11    MP      Fixed Asynch I/O support to reasonably account cycles
                         when an idle wait is terminated by an external event
@@ -286,8 +286,8 @@ return sim_os_sleep_min_ms;
 
 #if defined(MS_MIN_GRANULARITY) && (MS_MIN_GRANULARITY != 1)
 
-#define sim_idle_ms_sleep   real_sim_idle_ms_sleep 
-#define sim_os_msec         real_sim_os_msec 
+#define sim_idle_ms_sleep   real_sim_idle_ms_sleep
+#define sim_os_msec         real_sim_os_msec
 #define sim_os_ms_sleep     real_sim_os_ms_sleep
 
 #endif /* defined(MS_MIN_GRANULARITY) && (MS_MIN_GRANULARITY != 1) */
@@ -783,7 +783,7 @@ return sim_rtcn_init_unit_ticks (uptr, time, tmr, 0);
 int32 sim_rtcn_init_unit_ticks (UNIT *uptr, int32 time, int32 tmr, int32 ticksper)
 {
 RTC *rtc;
-        
+
 if (time == 0)
     time = 1;
 if (tmr == SIM_INTERNAL_CLK)
@@ -864,8 +864,8 @@ if (rtc->hz != ticksper) {                          /* changing tick rate? */
 
     if (rtc->hz == 0)
         rtc->clock_tick_start_time = sim_timenow_double ();
-    if ((rtc->last_hz != 0) && 
-        (rtc->last_hz != ticksper) && 
+    if ((rtc->last_hz != 0) &&
+        (rtc->last_hz != ticksper) &&
         (ticksper != 0))
         rtc->currd = (int32)(sim_timer_inst_per_sec () / ticksper);
     rtc->last_hz = rtc->hz;
@@ -912,9 +912,9 @@ if (sim_calb_tmr != tmr) {
     return rtc->currd;
     }
 new_rtime = sim_os_msec ();                         /* wall time */
-if (!sim_signaled_int_char && 
+if (!sim_signaled_int_char &&
     ((new_rtime - sim_last_poll_kbd_time) > 500)) {
-    sim_debug (DBG_CAL, &sim_timer_dev, "sim_rtcn_calb(tmr=%d) gratuitious keyboard poll after %d msecs\n", tmr, (int)(new_rtime - sim_last_poll_kbd_time));
+    sim_debug (DBG_CAL, &sim_timer_dev, "sim_rtcn_calb(tmr=%d) gratuitous keyboard poll after %d msecs\n", tmr, (int)(new_rtime - sim_last_poll_kbd_time));
     (void)sim_poll_kbd ();
     }
 ++rtc->calibrations;                                /* count calibrations */
@@ -989,7 +989,7 @@ if (sim_asynch_timer || (catchup_ticks_curr > 0)) {
         }
     rtc->based = rtc->currd = new_currd;
     rtc->gtime = new_gtime;                     /* save instruction time */
-    sim_debug (DBG_CAL, &sim_timer_dev, "sim_rtcn_calb(%s tmr=%d, tickper=%d) catchups=%u, idle=%d%% result: %d\n", 
+    sim_debug (DBG_CAL, &sim_timer_dev, "sim_rtcn_calb(%s tmr=%d, tickper=%d) catchups=%u, idle=%d%% result: %d\n",
                     sim_asynch_timer ? "asynch" : "catchup", tmr, ticksper, catchup_ticks_curr, last_idle_pct, rtc->currd);
     return rtc->currd;                          /* calibrated result */
     }
@@ -1016,7 +1016,7 @@ if (rtc->based <= 0)                                /* never negative or zero! *
     rtc->based = 1;
 if (rtc->currd <= 0)                                /* never negative or zero! */
     rtc->currd = 1;
-sim_debug (DBG_CAL, &sim_timer_dev, "sim_rtcn_calb(tmr=%d, tickper=%d) (delta_rtime=%d, delta_vtime=%d, base=%d, nxintv=%u, catchups=%u, idle=%d%%, result: %d)\n", 
+sim_debug (DBG_CAL, &sim_timer_dev, "sim_rtcn_calb(tmr=%d, tickper=%d) (delta_rtime=%d, delta_vtime=%d, base=%d, nxintv=%u, catchups=%u, idle=%d%%, result: %d)\n",
                                     tmr, ticksper, (int)delta_rtime, (int)delta_vtime, rtc->based, rtc->nxintv, catchup_ticks_curr, last_idle_pct, rtc->currd);
 /* Adjust calibration for other timers which depend on this timer's calibration */
 for (itmr=0; itmr<=SIM_NTIMERS; itmr++) {
@@ -1025,7 +1025,7 @@ for (itmr=0; itmr<=SIM_NTIMERS; itmr++) {
     if ((itmr != tmr) && (irtc->hz != 0))
         irtc->currd = (rtc->currd * ticksper) / irtc->hz;
     }
-AIO_SET_INTERRUPT_LATENCY(rtc->currd * ticksper);   /* set interrrupt latency */
+AIO_SET_INTERRUPT_LATENCY(rtc->currd * ticksper);   /* set interrupt latency */
 return rtc->currd;
 }
 
@@ -1077,7 +1077,7 @@ sim_stop_time = clock_last = clock_start = sim_os_msec ();
 sim_os_clock_resoluton_ms = 1000;
 do {
     uint32 clock_diff;
-    
+
     clock_now = sim_os_msec ();
     clock_diff = clock_now - clock_last;
     if ((clock_diff > 0) && (clock_diff < sim_os_clock_resoluton_ms))
@@ -1127,8 +1127,8 @@ if (sim_idle_enab) {
 if (sim_throt_type != SIM_THROT_NONE) {
     sim_show_throt (st, NULL, uptr, val, desc);
     }
-fprintf (st, "Calibrated Timer:               %s\n", (calb_tmr == -1) ? "Undetermined" : 
-                                                     ((calb_tmr == SIM_NTIMERS) ? "Internal Timer" : 
+fprintf (st, "Calibrated Timer:               %s\n", (calb_tmr == -1) ? "Undetermined" :
+                                                     ((calb_tmr == SIM_NTIMERS) ? "Internal Timer" :
                                                      (rtcs[calb_tmr].clock_unit ? sim_uname(rtcs[calb_tmr].clock_unit) : "")));
 if (calb_tmr == SIM_NTIMERS)
     fprintf (st, "Catchup Ticks:                  %s\n", sim_catchup_ticks ? "Enabled" : "Disabled");
@@ -1153,12 +1153,12 @@ for (tmr=clocks=0; tmr<=SIM_NTIMERS; ++tmr) {
 
     if (0 == rtc->initd)
         continue;
-    
+
     if (rtc->clock_unit) {
         ++clocks;
-        fprintf (st, "%s clock device is %s%s%s\n", sim_name, 
-                                                    (tmr == SIM_NTIMERS) ? "Internal Calibrated Timer(" : "", 
-                                                    sim_uname(rtc->clock_unit), 
+        fprintf (st, "%s clock device is %s%s%s\n", sim_name,
+                                                    (tmr == SIM_NTIMERS) ? "Internal Calibrated Timer(" : "",
+                                                    sim_uname(rtc->clock_unit),
                                                     (tmr == SIM_NTIMERS) ? ")" : "");
         }
 
@@ -1478,30 +1478,30 @@ return "Throttle facility";
 
 
 DEVICE sim_timer_dev = {
-    "INT-CLOCK", sim_timer_units, sim_timer_reg, sim_timer_mod, 
-    SIM_NTIMERS+1, 0, 0, 0, 0, 0, 
-    NULL, NULL, &sim_timer_clock_reset, NULL, NULL, NULL, 
-    NULL, DEV_DEBUG | DEV_NOSAVE, 0, 
+    "INT-CLOCK", sim_timer_units, sim_timer_reg, sim_timer_mod,
+    SIM_NTIMERS+1, 0, 0, 0, 0, 0,
+    NULL, NULL, &sim_timer_clock_reset, NULL, NULL, NULL,
+    NULL, DEV_DEBUG | DEV_NOSAVE, 0,
     sim_timer_debug};
 
 DEVICE sim_int_timer_dev = {
-    "INT-TIMER", &sim_internal_timer_unit, NULL, NULL, 
-    1, 0, 0, 0, 0, 0, 
-    NULL, NULL, NULL, NULL, NULL, NULL, 
+    "INT-TIMER", &sim_internal_timer_unit, NULL, NULL,
+    1, 0, 0, 0, 0, 0,
+    NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, DEV_NOSAVE};
 
 DEVICE sim_stop_dev = {
-    "INT-STOP", &sim_stop_unit, NULL, NULL, 
-    1, 0, 0, 0, 0, 0, 
-    NULL, NULL, NULL, NULL, NULL, NULL, 
-    NULL, DEV_NOSAVE, 0, 
+    "INT-STOP", &sim_stop_unit, NULL, NULL,
+    1, 0, 0, 0, 0, 0,
+    NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL, DEV_NOSAVE, 0,
     NULL, NULL, NULL, NULL, NULL, NULL,
     sim_int_stop_description};
 
 DEVICE sim_throttle_dev = {
     "INT-THROTTLE", &sim_throttle_unit, sim_throttle_reg, NULL,
-    1, 0, 0, 0, 0, 0, 
-    NULL, NULL, NULL, NULL, NULL, NULL, 
+    1, 0, 0, 0, 0, 0,
+    NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, DEV_NOSAVE};
 
 /* SET CLOCK command */
@@ -1569,35 +1569,35 @@ if ((!sim_idle_enab)                             ||     /* idling disabled */
     ((sim_clock_queue != QUEUE_LIST_END) &&             /* or clock queue not empty */
      ((sim_clock_queue->flags & UNIT_IDLE) == 0))||     /*   and event not idle-able? */
     (rtc->elapsed < sim_idle_stable)) {             /* or calibrated timer not stable? */
-    sim_debug (DBG_IDL, &sim_timer_dev, "Can't idle: %s - elapsed: %d and %d/%d\n", !sim_idle_enab ? "idle disabled" : 
-                                                                             ((rtc->elapsed < sim_idle_stable) ? "not stable" : 
-                                                                                                                     ((sim_clock_queue != QUEUE_LIST_END) ? sim_uname (sim_clock_queue) : 
+    sim_debug (DBG_IDL, &sim_timer_dev, "Can't idle: %s - elapsed: %d and %d/%d\n", !sim_idle_enab ? "idle disabled" :
+                                                                             ((rtc->elapsed < sim_idle_stable) ? "not stable" :
+                                                                                                                     ((sim_clock_queue != QUEUE_LIST_END) ? sim_uname (sim_clock_queue) :
                                                                                                                                                             "")), rtc->elapsed, rtc->ticks, rtc->hz);
     sim_interval -= sin_cyc;
     return FALSE;
     }
 /*
-   When a simulator is in an instruction path (or under other conditions 
-   which would indicate idling), the countdown of sim_interval may not 
-   be happening at a pace which is consistent with the rate it happens 
-   when not in the 'idle capable' state.  The consequence of this is that 
-   the clock calibration may produce calibrated results which vary much 
-   more than they do when not in the idle able state.  Sim_idle also uses 
+   When a simulator is in an instruction path (or under other conditions
+   which would indicate idling), the countdown of sim_interval may not
+   be happening at a pace which is consistent with the rate it happens
+   when not in the 'idle capable' state.  The consequence of this is that
+   the clock calibration may produce calibrated results which vary much
+   more than they do when not in the idle able state.  Sim_idle also uses
    the calibrated tick size to approximate an adjustment to sim_interval
-   to reflect the number of instructions which would have executed during 
-   the actual idle time, so consistent calibrated numbers produce better 
-   adjustments. 
-   
+   to reflect the number of instructions which would have executed during
+   the actual idle time, so consistent calibrated numbers produce better
+   adjustments.
+
    To negate this effect, we accumulate the time actually idled here.
-   sim_rtcn_calb compares the accumulated idle time during the most recent 
+   sim_rtcn_calb compares the accumulated idle time during the most recent
    second and if it exceeds the percentage defined by sim_idle_calib_pct
-   calibration is suppressed. Thus recalibration only happens if things 
+   calibration is suppressed. Thus recalibration only happens if things
    didn't idle too much.
 
    we also check check sim_idle_enab above so that all simulators can avoid
-   directly checking sim_idle_enab before calling sim_idle so that all of 
-   the bookkeeping on sim_idle_idled is done here in sim_timer where it 
-   means something, while not idling when it isn't enabled.  
+   directly checking sim_idle_enab before calling sim_idle so that all of
+   the bookkeeping on sim_idle_idled is done here in sim_timer where it
+   means something, while not idling when it isn't enabled.
    */
 sim_debug (DBG_TRC, &sim_timer_dev, "sim_idle(tmr=%d, sin_cyc=%d)\n", tmr, sin_cyc);
 if (sim_idle_cyc_ms == 0) {
@@ -1641,7 +1641,7 @@ act_cyc = act_ms * sim_idle_cyc_ms;
 if (cyc_since_idle > sim_idle_cyc_sleep)
     act_cyc -= sim_idle_cyc_sleep / 2;                  /* account for half an interval's worth of cycles */
 else
-    act_cyc -= (int32)cyc_since_idle;                   /* acount for cycles executed */
+    act_cyc -= (int32)cyc_since_idle;                   /* account for cycles executed */
 sim_interval = sim_interval - act_cyc;                  /* count down sim_interval to reflect idle period */
 sim_idle_end_time = sim_gtime();                        /* save idle completed time */
 if (sim_clock_queue == QUEUE_LIST_END)
@@ -1723,7 +1723,7 @@ else {
         if ((*tptr != '\0') || (val == 0))
             return sim_messagef (SCPE_ARG, "Invalid throttle delay specifier: %s\n", cptr);
         }
-    if (c == 'M') 
+    if (c == 'M')
         sim_throt_type = SIM_THROT_MCYC;
     else if (c == 'K')
         sim_throt_type = SIM_THROT_KCYC;
@@ -1841,7 +1841,6 @@ sim_cancel (&sim_throttle_unit);
 */
 t_stat sim_throt_svc (UNIT *uptr)
 {
-int32 tmr;
 uint32 delta_ms;
 double a_cps, d_cps, delta_inst;
 RTC *rtc = NULL;
@@ -1860,7 +1859,7 @@ switch (sim_throt_state) {
                 }
             sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc(INIT) Computing Throttling values based on the last second's execution rate\n");
             sim_throt_state = SIM_THROT_STATE_TIME;
-            if (sim_throt_peak_cps < (double)(rtc->hz * rtc->currd)) 
+            if (sim_throt_peak_cps < (double)(rtc->hz * rtc->currd))
                 sim_throt_peak_cps = (double)rtc->hz * rtc->currd;
             return sim_throt_svc (uptr);
             }
@@ -1902,11 +1901,11 @@ switch (sim_throt_state) {
                 sim_set_throt (0, NULL);                /* disable throttling */
                 return SCPE_OK;
                 }
-            sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Not enough time.  %d ms executing %.f %s.\n", 
+            sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Not enough time.  %d ms executing %.f %s.\n",
                                 (int)delta_ms, delta_inst, sim_vm_interval_units);
             sim_throt_wait = (int32)(delta_inst * SIM_THROT_WMUL);
             sim_throt_inst_start = sim_gtime();
-            sim_idle_ms_sleep (sim_idle_rate_ms);       /* start on a tick boundart to calibrate */
+            sim_idle_ms_sleep (sim_idle_rate_ms);       /* start on a tick boundary to calibrate */
             sim_throt_ms_start = sim_os_msec ();
             }
         else {                                          /* long enough */
@@ -1920,11 +1919,11 @@ switch (sim_throt_state) {
                     d_cps = (sim_throt_peak_cps * sim_throt_val) / 100.0;
             if (d_cps >= a_cps) {
                 /* the initial throttling calibration measures a slower cps rate than the desired cps rate, */
-                sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() CPU too slow.  Values a_cps = %f, d_cps = %f\n", 
+                sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() CPU too slow.  Values a_cps = %f, d_cps = %f\n",
                                                     a_cps, d_cps);
                 /* if the measured rate is well below the measured peak rate? */
                 if (sim_throt_peak_cps >= (2.0 * d_cps)) {
-                    /* distrust the measured rate and instead use half the peak rate as measured 
+                    /* distrust the measured rate and instead use half the peak rate as measured
                        cps rate. */
                     sim_printf ("*********** WARNING ***********\n");
                     sim_printf ("Host CPU could be too slow to simulate %s %s per second\n", sim_fmt_numeric(d_cps), sim_vm_interval_units);
@@ -1953,13 +1952,13 @@ switch (sim_throt_state) {
                 if (sim_throt_wait >= SIM_THROT_WMIN)   /* long enough? */
                     break;
                 sim_throt_sleep_time += sim_os_sleep_inc_ms;
-                sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Wait too small, increasing sleep time to %d ms.  Values a_cps = %f, d_cps = %f, wait = %d\n", 
+                sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Wait too small, increasing sleep time to %d ms.  Values a_cps = %f, d_cps = %f, wait = %d\n",
                                                     sim_throt_sleep_time, a_cps, d_cps, sim_throt_wait);
                 }
             sim_throt_ms_start = sim_throt_ms_stop;
             sim_throt_inst_start = sim_gtime();
             sim_throt_state = SIM_THROT_STATE_THROTTLE;
-            sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Throttle values a_cps = %f, d_cps = %f, wait = %d, sleep = %d ms\n", 
+            sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Throttle values a_cps = %f, d_cps = %f, wait = %d, sleep = %d ms\n",
                                                 a_cps, d_cps, sim_throt_wait, sim_throt_sleep_time);
             sim_throt_cps = d_cps;                  /* save the desired rate */
 	    _sim_timer_adjust_cal();                /* adjust timer calibrations */
@@ -1982,11 +1981,11 @@ switch (sim_throt_state) {
                     else
                         d_cps = (sim_throt_peak_cps * sim_throt_val) / 100.0;
                 if (fabs(100.0 * (d_cps - a_cps) / d_cps) > (double)sim_throt_drift_pct) {
-                    sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Recalibrating throttle based on values a_cps = %f, d_cps = %f deviating by %.2f%% from the desired value\n", 
+                    sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Recalibrating throttle based on values a_cps = %f, d_cps = %f deviating by %.2f%% from the desired value\n",
                                                         a_cps, d_cps, fabs(100.0 * (d_cps - a_cps) / d_cps));
                     if ((a_cps > d_cps) &&                      /* too fast? */
                         ((100.0 * (a_cps - d_cps) / d_cps) > (100 - sim_throt_drift_pct))) {
-                        sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Restarting calibrating throttle going too fast: a_cps = %f, d_cps = %f deviating by %.2f%% from the desired value\n", 
+                        sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Restarting calibrating throttle going too fast: a_cps = %f, d_cps = %f deviating by %.2f%% from the desired value\n",
                                                             a_cps, d_cps, fabs(100.0 * (d_cps - a_cps) / d_cps));
                         while (1) {
                             sim_throt_wait = (int32)            /* cycles between sleeps */
@@ -1995,16 +1994,16 @@ switch (sim_throt_state) {
                             if (sim_throt_wait >= SIM_THROT_WMIN)/* long enough? */
                                 break;
                             sim_throt_sleep_time += sim_os_sleep_inc_ms;
-                            sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Wait too small, increasing sleep time to %d ms.  Values a_cps = %f, d_cps = %f, wait = %d\n", 
+                            sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Wait too small, increasing sleep time to %d ms.  Values a_cps = %f, d_cps = %f, wait = %d\n",
                                                                 sim_throt_sleep_time, sim_throt_peak_cps, d_cps, sim_throt_wait);
                             }
                         }
                     else {                                      /* slow or within reasonable range */
-                        sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Adjusting wait before sleep interval by %d\n", 
+                        sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Adjusting wait before sleep interval by %d\n",
                                                             (int32)(((d_cps - a_cps) * (double)sim_throt_wait) / d_cps));
                         sim_throt_wait += (int32)(((d_cps - a_cps) * (double)sim_throt_wait) / d_cps);
                         }
-                    sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Throttle values a_cps = %f, d_cps = %f, wait = %d, sleep = %d ms\n", 
+                    sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Throttle values a_cps = %f, d_cps = %f, wait = %d, sleep = %d ms\n",
                                                         a_cps, d_cps, sim_throt_wait, sim_throt_sleep_time);
                     sim_throt_cps = d_cps;                      /* save the desired rate */
                     sim_throt_ms_start = sim_os_msec ();
@@ -2013,7 +2012,7 @@ switch (sim_throt_state) {
                 }
             else {                                      /* record instruction rate */
                 sim_throt_cps = (int32)a_cps;
-                sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Recalibrating Special %d/%u Cycles Per Second of %f\n", 
+                sim_debug (DBG_THR, &sim_timer_dev, "sim_throt_svc() Recalibrating Special %d/%u Cycles Per Second of %f\n",
                                                     sim_throt_wait, sim_throt_sleep_time, sim_throt_cps);
                 sim_throt_inst_start = sim_gtime();
                 sim_throt_ms_start = sim_os_msec ();
@@ -2050,7 +2049,7 @@ static void _sim_timer_adjust_cal(void)
     }
 }
 
-/* Clock assist activites */
+/* Clock assist activities */
 t_stat sim_timer_tick_svc (UNIT *uptr)
 {
 int32 tmr = (int32)(uptr-sim_timer_units);
@@ -2060,11 +2059,11 @@ RTC *rtc = &rtcs[tmr];
 rtc->clock_ticks += 1;
 rtc->calib_tick_time += rtc->clock_tick_size;
 /*
- * Some devices may depend on executing during the same instruction or 
- * immediately after the clock tick event.  To satisfy this, we directly 
+ * Some devices may depend on executing during the same instruction or
+ * immediately after the clock tick event.  To satisfy this, we directly
  * run the clock event here and if it completes successfully, schedule any
- * currently coschedule units to run now.  Ticks should never return a 
- * non-success status, while co-schedule activities might, so they are 
+ * currently coschedule units to run now.  Ticks should never return a
+ * non-success status, while co-schedule activities might, so they are
  * queued to run from sim_process_event
  */
 sim_debug (DBG_QUE, &sim_timer_dev, "sim_timer_tick_svc(tmr=%d) - scheduling %s - cosched interval: %d\n", tmr, sim_uname (rtc->clock_unit), rtc->cosched_interval);
@@ -2074,7 +2073,7 @@ stat = rtc->clock_unit->action (rtc->clock_unit);
 --rtc->cosched_interval;                    /* Countdown ticks */
 if (rtc->clock_cosched_queue != QUEUE_LIST_END)
     rtc->clock_cosched_queue->time = rtc->cosched_interval;
-if ((stat == SCPE_OK)                               && 
+if ((stat == SCPE_OK)                               &&
     (rtc->cosched_interval <= 0)                &&
     (rtc->clock_cosched_queue != QUEUE_LIST_END)) {
     UNIT *sptr = rtc->clock_cosched_queue;
@@ -2150,7 +2149,7 @@ if (now)
 return ts_now.tv_sec;
 }
 
-/* 
+/*
  * If the host system has a relatively large clock tick (as compared to
  * the desired simulated hz) ticks will naturally be scheduled late and
  * these delays will accumulate.  The net result will be unreasonably
@@ -2163,15 +2162,15 @@ return ts_now.tv_sec;
  * We accomodate these problems and make up for lost ticks by injecting
  * catch-up ticks to the simulator.
  *
- * When necessary, catch-up ticks are scheduled to run under one 
+ * When necessary, catch-up ticks are scheduled to run under one
  * of two conditions:
  *   1) after indicated number of instructions in a call by the simulator
- *      to sim_rtcn_tick_ack.  sim_rtcn_tick_ack exists to provide a 
- *      mechanism to inform the simh timer facilities when the simulated 
+ *      to sim_rtcn_tick_ack.  sim_rtcn_tick_ack exists to provide a
+ *      mechanism to inform the simh timer facilities when the simulated
  *      system has accepted the most recent clock tick interrupt.
  *   2) immediately when the simulator calls sim_idle
  *
- * catchup ticks are only scheduled (eligible to happen) under these 
+ * catchup ticks are only scheduled (eligible to happen) under these
  * conditions after at least one tick has been acknowledged.
  *
  * The clock tick UNIT that will be scheduled to run for catchup ticks
@@ -2229,7 +2228,7 @@ if ((!rtc->clock_catchup_eligible) &&           /* not eligible yet? */
     sim_debug (DBG_QUE, &sim_timer_dev, "_rtcn_tick_catchup_check() - Enabling catchup ticks for %s\n", sim_uname (rtc->clock_unit));
     bReturn = TRUE;
     }
-if ((rtc->hz > 0) && 
+if ((rtc->hz > 0) &&
     rtc->clock_catchup_eligible)
     {
     double tnow = sim_timenow_double();
@@ -2295,8 +2294,8 @@ _timer_thread(void *arg)
 int sched_policy;
 struct sched_param sched_priority;
 
-/* Boost Priority for this I/O thread vs the CPU instruction execution 
-   thread which, in general, won't be readily yielding the processor when 
+/* Boost Priority for this I/O thread vs the CPU instruction execution
+   thread which, in general, won't be readily yielding the processor when
    this thread needs to run */
 pthread_getschedparam (pthread_self(), &sched_policy, &sched_priority);
 ++sched_priority.sched_priority;
@@ -2317,7 +2316,7 @@ while (sim_asynch_timer && sim_is_running) {
 
     if (sim_wallclock_entry) {                          /* something to insert in queue? */
 
-        sim_debug (DBG_TIM, &sim_timer_dev, "_timer_thread() - timing %s for %s\n", 
+        sim_debug (DBG_TIM, &sim_timer_dev, "_timer_thread() - timing %s for %s\n",
                    sim_uname(sim_wallclock_entry), sim_fmt_secs (sim_wallclock_entry->a_usec_delay/1000000.0));
 
         uptr = sim_wallclock_entry;
@@ -2356,7 +2355,7 @@ while (sim_asynch_timer && sim_is_running) {
         sim_debug (DBG_TIM, &sim_timer_dev, "_timer_thread() - waiting forever\n");
     else
         sim_debug (DBG_TIM, &sim_timer_dev, "_timer_thread() - waiting for %.0f usecs until %.6f for %s\n", wait_usec, sim_wallclock_queue->a_due_time, sim_uname(sim_wallclock_queue));
-    if ((wait_usec <= 0.0) || 
+    if ((wait_usec <= 0.0) ||
         (0 != pthread_cond_timedwait (&sim_timer_wake, &sim_timer_lock, &due_time))) {
 
         if (sim_wallclock_queue == QUEUE_LIST_END)      /* queue empty? */
@@ -2372,7 +2371,7 @@ while (sim_asynch_timer && sim_is_running) {
             inst_delay = 0;
         else
             inst_delay = (int32)(inst_per_sec*(_timespec_to_double(&due_time)-_timespec_to_double(&stop_time)));
-        sim_debug (DBG_TIM, &sim_timer_dev, "_timer_thread() - slept %.0fms - activating(%s,%d)\n", 
+        sim_debug (DBG_TIM, &sim_timer_dev, "_timer_thread() - slept %.0fms - activating(%s,%d)\n",
                    1000.0*(_timespec_to_double (&stop_time)-_timespec_to_double (&start_time)), sim_uname(uptr), inst_delay);
         sim_activate (uptr, inst_delay);
         }
@@ -2390,17 +2389,17 @@ return NULL;
 #endif /* defined(SIM_ASYNCH_CLOCKS) */
 
 /*
-   In the event that there are no active calibrated clock devices, 
-   no instruction rate calibration will be performed.  This is more 
-   likely on simpler simulators which don't have a full spectrum of 
-   standard devices or possibly when a clock device exists but its 
+   In the event that there are no active calibrated clock devices,
+   no instruction rate calibration will be performed.  This is more
+   likely on simpler simulators which don't have a full spectrum of
+   standard devices or possibly when a clock device exists but its
    use is optional.
 
-   Additonally, when a host system has a natural clock tick (
-   or minimal sleep time) which is greater than the tick size that 
-   a simulator wants to run a clock at, we run this clock at the 
+   Additionally, when a host system has a natural clock tick (
+   or minimal sleep time) which is greater than the tick size that
+   a simulator wants to run a clock at, we run this clock at the
    rate implied by the host system's minimal sleep time or 50Hz.
-   
+
    To solve this we merely run an internal clock at 100Hz.
  */
 
@@ -2412,22 +2411,22 @@ sim_activate_after (uptr, 1000000/sim_int_clk_tps);     /* reactivate unit */
 return SCPE_OK;
 }
 
-/* 
-  This routine exists to assure that there is a single reliably calibrated 
-  clock properly counting instruction execution relative to time.  The best 
-  way to assure reliable calibration is to use a clock which ticks no 
-  faster than the host system's clock.  This is optimal so that accurate 
-  time measurements are taken.  If the simulated system doesn't have a 
-  clock with an appropriate tick rate, an internal clock is run that meets 
+/*
+  This routine exists to assure that there is a single reliably calibrated
+  clock properly counting instruction execution relative to time.  The best
+  way to assure reliable calibration is to use a clock which ticks no
+  faster than the host system's clock.  This is optimal so that accurate
+  time measurements are taken.  If the simulated system doesn't have a
+  clock with an appropriate tick rate, an internal clock is run that meets
   this requirement, OR when asynch clocks are enabled, the internal clock
   is always run.
 
-  Some simulators have clocks that have dynamically programmable tick 
-  rates. Such a clock is only a reliable candidate to be the calibrated 
-  clock if it uses a single tick rate rather than changing the tick rate 
+  Some simulators have clocks that have dynamically programmable tick
+  rates. Such a clock is only a reliable candidate to be the calibrated
+  clock if it uses a single tick rate rather than changing the tick rate
   on the fly.  Generally most systems like this, under normal conditions
   don't change their tick rates unless they're running something that is
-  examining the behavior of the clock system (like a diagnostic).  Under 
+  examining the behavior of the clock system (like a diagnostic).  Under
   these conditions this clock is removed from the potential selection as
   "the" calibrated clock all others are relative to and if necessary, an
   internal calibrated clock is selected.
@@ -2486,7 +2485,7 @@ if (tmr == SIM_NTIMERS) {                   /* None found? */
         }
     return;
     }
-if ((tmr == newtmr) && 
+if ((tmr == newtmr) &&
     (sim_calb_tmr == newtmr))               /* already set? */
     return;
 if (sim_calb_tmr == SIM_NTIMERS) {          /* was old the internal timer? */
@@ -2567,7 +2566,7 @@ if (sim_calb_tmr == -1) {
     }
 else {
     if (sim_calb_tmr == SIM_NTIMERS) {
-        sim_debug (DBG_CAL, &sim_timer_dev, "sim_start_timer_services() - restarting internal timer after %d %s\n", 
+        sim_debug (DBG_CAL, &sim_timer_dev, "sim_start_timer_services() - restarting internal timer after %d %s\n",
                                             sim_internal_timer_time, sim_vm_interval_units);
         sim_activate (&SIM_INTERNAL_UNIT, sim_internal_timer_time);
         }
@@ -2730,7 +2729,7 @@ for (tmr=0; tmr<=SIM_NTIMERS; tmr++) {
 if (sim_is_active (uptr))                               /* already active? */
     return SCPE_OK;
 if (usec_delay < 0.0) {
-    sim_debug (DBG_QUE, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - surprising usec value\n", 
+    sim_debug (DBG_QUE, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - surprising usec value\n",
                sim_uname(uptr), usec_delay);
     }
 if ((sim_is_running) || (tmr <= SIM_NTIMERS))
@@ -2739,7 +2738,7 @@ else {                                      /* defer non timer wallclock activat
     uptr->usecs_remaining = usec_delay;
     usec_delay = 0;
     }
-/* 
+/*
  * Handle long delays by aligning with the calibrated timer's calibration
  * activities.  Delays which would expire prior to the next calibration
  * are specifically scheduled directly based on the the current instruction
@@ -2769,9 +2768,9 @@ if (sim_calb_tmr != -1) {
             if (inst_delay_d > (double)inst_til_calib) {    /* long wait? */
                 stat = sim_clock_coschedule_tmr (uptr, sim_calb_tmr, ticks_til_calib - 1);
                 uptr->usecs_remaining = (stat == SCPE_OK) ? usec_delay - usecs_til_calib : 0.0;
-                sim_debug (DBG_TIM, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - coscheduling with with calibrated timer(%d), ticks=%d, usecs_remaining=%.0f usecs, inst_til_tick=%d, ticks_til_calib=%d, usecs_til_calib=%u\n", 
+                sim_debug (DBG_TIM, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - coscheduling with with calibrated timer(%d), ticks=%d, usecs_remaining=%.0f usecs, inst_til_tick=%d, ticks_til_calib=%d, usecs_til_calib=%u\n",
                            sim_uname(uptr), usec_delay, sim_calb_tmr, ticks_til_calib, uptr->usecs_remaining, inst_til_tick, ticks_til_calib, usecs_til_calib);
-                sim_debug (DBG_CHK, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - result = %.0f usecs, %.0f usecs\n", 
+                sim_debug (DBG_CHK, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - result = %.0f usecs, %.0f usecs\n",
                            sim_uname(uptr), usec_delay, sim_timer_activate_time_usecs (ouptr), sim_timer_activate_time_usecs (uptr));
                 return stat;
                 }
@@ -2781,16 +2780,16 @@ if (sim_calb_tmr != -1) {
 
                 stat = sim_clock_coschedule_tmr (uptr, sim_calb_tmr, 0);
                 uptr->usecs_remaining = (stat == SCPE_OK) ? usec_delay - usecs_til_tick : 0.0;
-                sim_debug (DBG_TIM, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - coscheduling with with calibrated timer(%d), ticks=%d, usecs_remaining=%.0f usecs, inst_til_tick=%d, usecs_til_tick=%.0f\n", 
+                sim_debug (DBG_TIM, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - coscheduling with with calibrated timer(%d), ticks=%d, usecs_remaining=%.0f usecs, inst_til_tick=%d, usecs_til_tick=%.0f\n",
                            sim_uname(uptr), usec_delay, sim_calb_tmr, 0, uptr->usecs_remaining, inst_til_tick, usecs_til_tick);
-                sim_debug (DBG_CHK, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - result = %.0f usecs, %.0f usecs\n", 
+                sim_debug (DBG_CHK, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - result = %.0f usecs, %.0f usecs\n",
                            sim_uname(uptr), usec_delay, sim_timer_activate_time_usecs (ouptr), sim_timer_activate_time_usecs (uptr));
                 return stat;
                 }
             }
         }
     }
-/* 
+/*
  * We're here to schedule if:
  * No Calibrated Timer, OR
  * Scheduling the Calibrated Timer OR
@@ -2798,8 +2797,8 @@ if (sim_calb_tmr != -1) {
  */
 /*
  * Bound delay to avoid overflow.
- * Long delays are usually canceled before they expire, however bounding the 
- * delay will cause sim_activate_time to return inconsistent results when 
+ * Long delays are usually canceled before they expire, however bounding the
+ * delay will cause sim_activate_time to return inconsistent results when
  * truncation has happened.
  */
 if (inst_delay_d > (double)0x7fffffff)
@@ -2823,7 +2822,7 @@ if ((sim_asynch_timer) &&
         rtc->clock_unit->a_is_active = &_sim_wallclock_is_active;
         }
 
-    sim_debug (DBG_TIM, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - queueing wallclock addition at %.6f\n", 
+    sim_debug (DBG_TIM, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - queueing wallclock addition at %.6f\n",
                sim_uname(uptr), usec_delay, uptr->a_due_time);
 
     pthread_mutex_lock (&sim_timer_lock);
@@ -2836,7 +2835,7 @@ if ((sim_asynch_timer) &&
         uptr->a_next = QUEUE_LIST_END;              /* Temporarily mark as active */
         if (sim_timer_thread_running) {
             while (sim_wallclock_entry) {               /* wait for any prior entry has been digested */
-                sim_debug (DBG_TIM, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - queue insert entry %s busy waiting for 1ms\n", 
+                sim_debug (DBG_TIM, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - queue insert entry %s busy waiting for 1ms\n",
                            sim_uname(uptr), usec_delay, sim_uname(sim_wallclock_entry));
                 pthread_mutex_unlock (&sim_timer_lock);
                 sim_os_ms_sleep (1);
@@ -2857,9 +2856,9 @@ if ((sim_asynch_timer) &&
     }
 #endif
 stat = _sim_activate (uptr, inst_delay);                /* queue it now */
-sim_debug (DBG_TIM, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - queue addition at %d - remnant: %.0f\n", 
+sim_debug (DBG_TIM, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - queue addition at %d - remnant: %.0f\n",
            sim_uname(uptr), usec_delay, inst_delay, uptr->usecs_remaining);
-sim_debug (DBG_CHK, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - result = %.0f usecs, %.0f usecs\n", 
+sim_debug (DBG_CHK, &sim_timer_dev, "sim_timer_activate_after(%s, %.0f usecs) - result = %.0f usecs, %.0f usecs\n",
            sim_uname(uptr), usec_delay, sim_timer_activate_time_usecs (ouptr), sim_timer_activate_time_usecs (uptr));
 return stat;
 }
@@ -2900,7 +2899,7 @@ if (rtc->clock_unit == NULL)
     rtc->clock_cosched_queue = QUEUE_LIST_END;
 rtc->clock_unit = uptr;
 uptr->dynflags |= UNIT_TMR_UNIT;
-rtc->timer_unit->flags = ((tmr == SIM_NTIMERS) ? 0 : UNIT_DIS) | 
+rtc->timer_unit->flags = ((tmr == SIM_NTIMERS) ? 0 : UNIT_DIS) |
                           (rtc->clock_unit ? UNIT_IDLE : 0);
 return SCPE_OK;
 }
@@ -3213,7 +3212,7 @@ for (tmr=0; tmr<=SIM_NTIMERS; tmr++) {
         return _sim_activate_time (&sim_timer_units[tmr]);
         }
     }
-return -1;                                          /* Not found. */    
+return -1;                                          /* Not found. */
 }
 
 double sim_timer_activate_time_usecs (UNIT *uptr)
@@ -3305,7 +3304,7 @@ for (tmr=0; tmr<=SIM_NTIMERS; tmr++) {
     }
 result = uptr->usecs_remaining + (1000000.0 * (sim_activate_time (uptr) - 1)) / sim_timer_inst_per_sec ();
 sim_debug (DBG_QUE, &sim_timer_dev, "sim_timer_activate_time_usecs(%s) clock - %.0f usecs, inst_per_sec=%.0f, usecs_remaining=%.0f\n", sim_uname (uptr), result, sim_timer_inst_per_sec (), uptr->usecs_remaining);
-return result;                                          /* Not found. */    
+return result;                                          /* Not found. */
 }
 
 /* read only memory delayed support
@@ -3314,10 +3313,10 @@ return result;                                          /* Not found. */
    time to meet timing assumptions in the code being executed.
 
    The default calibration determines a way to limit activities
-   to 1Mhz for each call to sim_rom_read_with_delay().  If a 
-   simulator needs a different delay factor, the 1 Mhz initial 
-   value can be queried with sim_get_rom_delay_factor() and the 
-   result can be adjusted as nessary and the operating delay
+   to 1Mhz for each call to sim_rom_read_with_delay().  If a
+   simulator needs a different delay factor, the 1 MHz initial
+   value can be queried with sim_get_rom_delay_factor() and the
+   result can be adjusted as necessary and the operating delay
    can be set with sim_set_rom_delay_factor().
 */
 
@@ -3341,7 +3340,7 @@ return val + rom_loopval;
 SIM_NOINLINE uint32 sim_get_rom_delay_factor (void)
 {
 /* Calibrate the loop delay factor at startup.
-   Do this 4 times and use the largest value computed. 
+   Do this 4 times and use the largest value computed.
    The goal here is to come up with a delay factor which will throttle
    a 6 byte delay loop running from ROM address space to execute
    1 instruction per usec */
@@ -3361,7 +3360,7 @@ if (sim_rom_delay == 0) {
 
         for (i = 0; i < c; i++)
             rom_loopval |= (rom_loopval + ts) ^ _rom_swapb (_rom_swapb (rom_loopval + ts));
-        te = sim_os_msec (); 
+        te = sim_os_msec ();
         if ((te - ts) < 50)                         /* sample big enough? */
             continue;
         if (sim_rom_delay < (rom_loopval + (c / (te - ts) / 1000) + 1))
@@ -3385,9 +3384,9 @@ sim_rom_delay = delay;
  *
  * The point of this routine is to run a bunch of simulator provided
  * instructions that don't do anything, but run in an effective loop.
- * That loop is run for some 5 million instructions and based on 
+ * That loop is run for some 5 million instructions and based on
  * the time those 5 million instructions take to execute the effective
- * execution rate.  That rate is used to avoid the initial 3 to 5 
+ * execution rate.  That rate is used to avoid the initial 3 to 5
  * seconds that normal clock calibration takes.
  *
  */
@@ -3434,7 +3433,7 @@ sim_inst_per_sec_last = sim_precalibrate_ips;
 sim_idle_stable = 0;
 }
 
-double 
+double
 sim_host_speed_factor (void)
 {
 if (sim_precalibrate_ips > sim_vm_initial_ips)
diff --git a/sim_tmxr.c b/sim_tmxr.c
index c8c2095..2ae5791 100644
--- a/sim_tmxr.c
+++ b/sim_tmxr.c
@@ -26,7 +26,7 @@
    Based on the original DZ11 simulator by Thord Nilson, as updated by
    Arthur Krewat.
 
-   12-Oct-12    MP      Revised serial port support to not require changes to 
+   12-Oct-12    MP      Revised serial port support to not require changes to
                         any code in TMXR library using code.  Added support
                         for per line listener ports and outgoing tcp connections.
    02-Jun-11    MP      Fixed telnet option negotiation loop with some clients
@@ -68,7 +68,7 @@
    tmxr_detach_ln -                     reset line and close per line listener and outgoing destination
    tmxr_getc_ln -                       get character for line
    tmxr_get_packet_ln -                 get packet from line
-   tmxr_get_packet_ln_ex -              get packet from line with separater byte
+   tmxr_get_packet_ln_ex -              get packet from line with separator byte
    tmxr_poll_rx -                       poll receive
    tmxr_putc_ln -                       put character for line
    tmxr_put_packet_ln -                 put packet on line
@@ -113,18 +113,18 @@
    tmxr_show_summ -                     show connection summary
    tmxr_show_cstat -                    show line connections or status
    tmxr_show_lines -                    show number of lines
-   tmxr_show_open_devices -             show info about all open tmxr devices 
+   tmxr_show_open_devices -             show info about all open tmxr devices
 
    All routines are OS-independent.
 
 
     This library supports the simulation of multiple-line terminal multiplexers.
     It may also be used to create single-line "multiplexers" to provide
-    additional terminals beyond the simulation console.  It may also be used to 
+    additional terminals beyond the simulation console.  It may also be used to
     create single-line or multi-line simulated synchronous (BiSync) devices.
-    Multiplexer lines may be connected to terminal emulators supporting the 
+    Multiplexer lines may be connected to terminal emulators supporting the
     Telnet protocol via sockets, or to hardware terminals via host serial
-    ports.  Concurrent Telnet and serial connections may be mixed on a given 
+    ports.  Concurrent Telnet and serial connections may be mixed on a given
     multiplexer.
 
     When connecting via sockets, the simulated multiplexer is attached to a
@@ -137,51 +137,51 @@
     When a connection attempt is received, it will be associated with the next
     multiplexer line in the user-specified line order, or with the next line in
     sequence if no order has been specified.  Individual lines may be connected
-    to serial ports or remote systems via TCP (telnet or not as desired), OR 
+    to serial ports or remote systems via TCP (telnet or not as desired), OR
     they may have separate listening TCP ports.
 
     Logging of Multiplexer Line output:
-    
+
     The traffic going out multiplexer lines can be logged to files.  A single
     line multiplexer can log it's traffic with the following command:
 
         sim> atta MUX 23,Log=LogFileName
         sim> atta MUX Connect=ser0,Log=LogFileName
 
-    Specifying a Log value for a multi-line multiplexer is specifying a 
+    Specifying a Log value for a multi-line multiplexer is specifying a
     template filename.  The actual file name used for each line will be
     the indicated filename with _n appended (n being the line number).
 
     Buffered Multiplexer Line:
 
-    A Multiplexer Line Buffering has been implemented.  A Buffered Line will 
+    A Multiplexer Line Buffering has been implemented.  A Buffered Line will
     have a copy of the last 'buffer size' bytes of output retained in a line
     specific buffer.  The contents of this buffer will be transmitted out any
     new connection on that line when a new telnet session is established.
 
     This capability is most useful for the Console Telnet session.  When a
-    Console Telnet session is Buffered, a simulator will start (via BOOT CPU 
-    or whatever is appropriate for a particular simulator) without needing to 
-    have an active telnet connection.  When a Telnet connection comes along 
-    for the telnet port, the contents of the saved buffer (which wraps on 
-    overflow) are presented on the telnet session as output before session 
-    traffic.  This allows the connecting telnet client to see what happened 
-    before he connected since the likely reason he might be connecting to the 
-    console of a background simulator is to troubleshoot unusual behavior, 
+    Console Telnet session is Buffered, a simulator will start (via BOOT CPU
+    or whatever is appropriate for a particular simulator) without needing to
+    have an active telnet connection.  When a Telnet connection comes along
+    for the telnet port, the contents of the saved buffer (which wraps on
+    overflow) are presented on the telnet session as output before session
+    traffic.  This allows the connecting telnet client to see what happened
+    before he connected since the likely reason he might be connecting to the
+    console of a background simulator is to troubleshoot unusual behavior,
     the details of which may have already been sent to the console.
 
     Serial Port support:
 
     Serial ports may be specified as an operating system specific device names
-    or using simh generic serial names.  simh generic names are of the form 
-    serN, where N is from 0 thru one less than the maximum number of serial 
-    ports on the local system.  The mapping of simh generic port names to OS 
+    or using simh generic serial names.  simh generic names are of the form
+    serN, where N is from 0 thru one less than the maximum number of serial
+    ports on the local system.  The mapping of simh generic port names to OS
     specific names can be displayed using the following command:
 
         sim> show serial
         Serial devices:
          ser0   COM1 (\Device\Serial0)
-         ser1   COM3 (Winachcf0)        
+         ser1   COM3 (Winachcf0)
 
         sim> attach MUX Line=2,Connect=ser0
 
@@ -206,37 +206,37 @@
 
         9600-8n1
 
-    The supported rates, sizes, and parity options are host-specific.  If 
-    a configuration string is not supplied, then the default of 9600-8N1 
+    The supported rates, sizes, and parity options are host-specific.  If
+    a configuration string is not supplied, then the default of 9600-8N1
     is used.
 
-    An attachment to a serial port with the '-V' switch will cause a 
+    An attachment to a serial port with the '-V' switch will cause a
     connection message to be output to the connected serial port.
-    This will help to confirm the correct port has been connected and 
+    This will help to confirm the correct port has been connected and
     that the port settings are reasonable for the connected device.
     This would be done as:
-     
-        sim> attach -V MUX Connect=SerN
-        
 
-    Line specific tcp listening ports are supported.  These are configured 
+        sim> attach -V MUX Connect=SerN
+
+
+    Line specific tcp listening ports are supported.  These are configured
     using commands of the form:
-     
+
         sim> attach MUX Line=2,port{;notelnet}|{;nomessage}
 
-    Direct computer to computer connections (Virutal Null Modem cables) may 
+    Direct computer to computer connections (Virtual Null Modem cables) may
     be established using the telnet protocol or via raw tcp sockets.
-     
+
         sim> attach MUX Line=2,Connect=host:port{;notelnet}
 
-    Computer to computer virtual connections can be one way (as illustrated 
-    above) or symmetric.  A symmetric connection is configured by combining 
+    Computer to computer virtual connections can be one way (as illustrated
+    above) or symmetric.  A symmetric connection is configured by combining
     a one way connection with a tcp listening port on the same line:
 
         sim> attach MUX Line=2,Connect=host:port,listenport
 
-    When symmetric virtual connections are configured, incoming connections 
-    on the specified listening port are checked to assure that they actually 
+    When symmetric virtual connections are configured, incoming connections
+    on the specified listening port are checked to assure that they actually
     come from the specified connection destination host system.
 
 
@@ -255,7 +255,7 @@
         sim> attach MX Line=n,Connect=serN{;config}        ; Connects line n to simh generic serial port N (port list visible with the sim> SHOW SERIAL command), the optional ";config" data specifies the speed, parity and stop bits for the connection
                                                            ; DTR (and RTS) will be raised at attach time and will drop at detach/disconnect time
         sim> attach MX Line=n,Connect=host:port{;notelnet} ; Causes a connection to be established to the designated host:port.  The actual connection will happen in a non-blocking fashion and will be completed and/or re-established by the normal tmxr_poll_conn activities
-     
+
      All connections configured for any multiplexer device are unconfigured by:
 
         sim> detach MX                              ; detaches ALL connections/ports/sessions on the MUX.
@@ -270,17 +270,17 @@
 
         sim> attach MUX Line=2,12366
 
-    A line specific remote telnet (or raw tcp) destination can be specified 
+    A line specific remote telnet (or raw tcp) destination can be specified
     by the following:
 
         sim> attach MUX Line=2,Connect=remotehost:port
 
-    If a connection to a remotehost:port wants a raw binary data channel 
+    If a connection to a remotehost:port wants a raw binary data channel
     (instead of a telnet session) the following would be used:
 
         sim> attach MUX Line=2,Connect=remotehost:port;notelnet
 
-    A single line multiplexor can indicate any of the above line options 
+    A single line multiplexor can indicate any of the above line options
     without specifying a line number:
 
         sim> attach MUX Connect=ser0;9600-8N1
@@ -293,38 +293,38 @@
 
         sim> detach MUX
 
-   A device emulation may choose to implement a command interface to 
+   A device emulation may choose to implement a command interface to
    disconnect specific individual lines.  This would usually be done via
-   a Unit Modifier table entry (MTAB) which dispatches the command 
-   "SET dev DISCONNECT[=line]" to tmxr_dscln.  This will cause a telnet 
-   connection to be closed, but a serial port will normally have DTR 
-   dropped for 500ms and raised again (thus hanging up a modem on that 
+   a Unit Modifier table entry (MTAB) which dispatches the command
+   "SET dev DISCONNECT[=line]" to tmxr_dscln.  This will cause a telnet
+   connection to be closed, but a serial port will normally have DTR
+   dropped for 500ms and raised again (thus hanging up a modem on that
    serial port).
 
      sim> set MUX disconnect=2
 
     Full Modem Control serial port support.
 
-    This library supports devices which wish to emulate full modem 
-    control/signalling for serial ports.  Any device emulation which wishes 
+    This library supports devices which wish to emulate full modem
+    control/signalling for serial ports.  Any device emulation which wishes
     to support this functionality for attached serial ports must call
-    "tmxr_set_modem_control_passthru" before any call to tmxr_attach.  
+    "tmxr_set_modem_control_passthru" before any call to tmxr_attach.
     This disables automatic DTR (&RTS) manipulation by this library.
-    Responsibility for manipulating DTR falls on the simulated operating 
-    system.  Calling tmxr_set_modem_control_passthru would usually be in 
+    Responsibility for manipulating DTR falls on the simulated operating
+    system.  Calling tmxr_set_modem_control_passthru would usually be in
     a device reset routine.  It may also be called by a device attach
     routine based on user specified options.
-    Once support for full modem control has been declared by a device 
-    emulation for a particular TMXR device, this library will make no 
+    Once support for full modem control has been declared by a device
+    emulation for a particular TMXR device, this library will make no
     direct effort to manipulate modem bits while connected to serial ports.
-    The "tmxr_set_get_modem_bits" API exists to allow the device emulation 
-    layer to query and control modem signals.  The "tmxr_set_config_line" 
-    API exists to allow the device emulation layer to change port settings 
-    (baud rate, parity and stop bits).  A modem_control enabled line 
-    merely passes the VM's port status bits, data and settings through to 
-    and from the serial port.  
+    The "tmxr_set_get_modem_bits" API exists to allow the device emulation
+    layer to query and control modem signals.  The "tmxr_set_config_line"
+    API exists to allow the device emulation layer to change port settings
+    (baud rate, parity and stop bits).  A modem_control enabled line
+    merely passes the VM's port status bits, data and settings through to
+    and from the serial port.
 
-    The "tmxr_set_get_modem_bits" and "tmxr_set_config_line" APIs will 
+    The "tmxr_set_get_modem_bits" and "tmxr_set_config_line" APIs will
     ONLY work on a modem control enabled TMXR device.
 
 */
@@ -374,7 +374,7 @@
 #define TN_NAOCRD        10                             /* Output Carriage-Return Disposition */
 #define TN_NAOHTS        11                             /* Output Horizontal Tab Stops */
 #define TN_NAOHTD        12                             /* Output Horizontal Tab Stop Disposition */
-#define TN_NAOFFD        13                             /* Output Forfeed Disposition */
+#define TN_NAOFFD        13                             /* Output Formfeed Disposition */
 #define TN_NAOVTS        14                             /* Output Vertical Tab Stop */
 #define TN_NAOVTD        15                             /* Output Vertical Tab Stop Disposition */
 #define TN_NAOLFD        16                             /* Output Linefeed Disposition */
@@ -457,7 +457,7 @@ typedef struct framer_data {
     uint32 fspeed;                  /* Framer link speed from attach command */
     struct status_msg_t status;     /* Last received status message */
     int status_cnt;                 /* Count of status messages seen */
-    t_bool connect_pending;         /* True if connected not yet reported */    
+    t_bool connect_pending;         /* True if connected not yet reported */
 } FRAMER;
 
 static BITFIELD tmxr_modem_bits[] = {
@@ -539,7 +539,7 @@ memset (lp->rbr, 0, lp->rxbsz);                         /* clear break status ar
 
 /* Report a connection to a line.
 
-   If the indicated line (lp) is speaking the telnet wire protocol, a 
+   If the indicated line (lp) is speaking the telnet wire protocol, a
    notification of the form:
 
       Connected to the <sim> simulator <dev> device, line <n>
@@ -917,9 +917,9 @@ if (tptr == NULL)                                       /* no more mem? */
     return tptr;
 
 if (mp->port) {                                         /* copy port */
-    sprintf (growstring(&tptr, 33 + strlen (mp->port)), "%s%s", mp->port, 
-                                                                mp->notelnet ? ";notelnet" : 
-                                                                               (mp->nomessage ? ";nomessage" : 
+    sprintf (growstring(&tptr, 33 + strlen (mp->port)), "%s%s", mp->port,
+                                                                mp->notelnet ? ";notelnet" :
+                                                                               (mp->nomessage ? ";nomessage" :
                                                                                                 ""));
     if (mp->acl) {                                      /* copy acl in pieces */
         char gbuf[CBUFSIZE];
@@ -967,10 +967,10 @@ return tptr;
    Inputs:
         *lp     =       pointer to terminal line descriptor
    Outputs:
-        a string which can be used to reconfigure the line, 
+        a string which can be used to reconfigure the line,
         NULL if the line isn't configured
 
-   Note: The returned string is dynamically allocated memory and must be freed 
+   Note: The returned string is dynamically allocated memory and must be freed
          when it is no longer needed by calling free
 
 */
@@ -1000,8 +1000,8 @@ if (lp->destination || lp->port || lp->txlogname || (lp->conn == TMXR_LINE_DISAB
     if (lp->mp->packet != lp->packet)
         sprintf (growstring(&tptr, 8), ",Packet");
     if (lp->port) {
-        sprintf (growstring(&tptr, 32 + strlen (lp->port)), ",%s%s%s", lp->port, 
-                                                                       ((lp->mp->notelnet != lp->notelnet) && (!lp->datagram)) ? (lp->notelnet ? ";notelnet" : ";telnet") : "", 
+        sprintf (growstring(&tptr, 32 + strlen (lp->port)), ",%s%s%s", lp->port,
+                                                                       ((lp->mp->notelnet != lp->notelnet) && (!lp->datagram)) ? (lp->notelnet ? ";notelnet" : ";telnet") : "",
                                                                        ((lp->mp->nomessage != lp->nomessage) && (!lp->datagram)) ? (lp->nomessage ? ";nomessage" : ";message") : "");
         if (lp->acl) {                                      /* copy acl in pieces */
             char gbuf[CBUFSIZE];
@@ -1079,7 +1079,7 @@ if (mp->last_poll_time == 0) {                          /* first poll initializa
     UNIT *uptr = mp->uptr;
 
     if (!uptr)                                          /* Attached ? */
-        return -1;                                      /* No connections are possinle! */
+        return -1;                                      /* No connections are possible! */
 
     uptr->tmxr = (void *)mp;                            /* Connect UNIT to TMXR */
     uptr->dynflags |= UNIT_TM_POLL;                     /* Tag as polling unit */
@@ -1112,7 +1112,7 @@ if (mp->last_poll_time == 0) {                          /* first poll initializa
         }
     }
 
-if (sim_is_running && 
+if (sim_is_running &&
     ((poll_time - mp->last_poll_time) < mp->poll_interval*1000))
     return -1;                                          /* too soon to try */
 
@@ -1175,7 +1175,7 @@ if (mp->master) {
                     lp = mp->ldsc + j;                      /* get pointer to line descriptor */
                     if (lp->framer)
                         continue;
-                    
+
                     if ((lp->conn == FALSE) &&              /* is the line available? */
                         (lp->destination == NULL) &&
                         (lp->master == 0) &&
@@ -1251,7 +1251,7 @@ for (i = 0; i < mp->lines; i++) {                       /* check each line in se
     lp = mp->ldsc + i;                                  /* get pointer to line descriptor */
 
     /* Check for pending serial port connection notification */
-    
+
     if (lp->ser_connect_pending) {
         lp->ser_connect_pending = FALSE;
         lp->conn = TRUE;
@@ -1274,12 +1274,12 @@ for (i = 0; i < mp->lines; i++) {                       /* check each line in se
     if (lp->loopback)
         continue;
 
-    /* If two simulators are configured with symmetric virtual null modem 
-       cables pointing at each other, there may be a problem establishing 
+    /* If two simulators are configured with symmetric virtual null modem
+       cables pointing at each other, there may be a problem establishing
        a connection if both systems happen to be checking for the success
        of their connections in the exact same order.  They can each observe
-       success in their respective outgoing connections, which haven't 
-       actually been 'accept'ed on the peer end of the connection.  
+       success in their respective outgoing connections, which haven't
+       actually been 'accept'ed on the peer end of the connection.
        We address this issue by checking for the success of an outgoing
        connection and the arrival of an incoming one in a random order.
      */
@@ -1356,7 +1356,7 @@ for (i = 0; i < mp->lines; i++) {                       /* check each line in se
                             if (lp->connecting) {
                                 snprintf (msg, sizeof (msg) -1, "tmxr_poll_conn() - aborting outgoing line connection attempt to: %s", lp->destination);
                                 tmxr_debug_connect_line (lp, msg);
-                                sim_close_sock (lp->connecting);    /* abort our as yet unconnnected socket */
+                                sim_close_sock (lp->connecting);    /* abort our as yet unconnected socket */
                                 lp->connecting = 0;
                                 }
                             }
@@ -1396,11 +1396,11 @@ for (i = 0; i < mp->lines; i++) {                       /* check each line in se
 
     /* Check for needed outgoing connection initiation */
 
-    if (lp->destination && (!lp->sock) && (!lp->connecting) && (!lp->serport) && 
+    if (lp->destination && (!lp->sock) && (!lp->connecting) && (!lp->serport) &&
         (!lp->modem_control || (lp->modembits & TMXR_MDM_DTR))) {
         snprintf (msg, sizeof (msg) - 1, "tmxr_poll_conn() - establishing outgoing connection to: %s", lp->destination);
         tmxr_debug_connect_line (lp, msg);
-        lp->connecting = sim_connect_sock_ex (lp->datagram ? lp->port : NULL, lp->destination, "localhost", NULL, (lp->datagram ? SIM_SOCK_OPT_DATAGRAM : 0)  | 
+        lp->connecting = sim_connect_sock_ex (lp->datagram ? lp->port : NULL, lp->destination, "localhost", NULL, (lp->datagram ? SIM_SOCK_OPT_DATAGRAM : 0)  |
                                                                                                                   (lp->mp->packet ? SIM_SOCK_OPT_NODELAY : 0));
         }
 
@@ -1414,8 +1414,8 @@ return ringing;                                         /* no new connections ma
    The telnet/tcp or serial session associated with multiplexer descriptor "mp" and
    line descriptor "lp" is disconnected.  An associated tcp socket is
    closed; a serial port is closed if the closeserial parameter is true, otherwise
-   for non modem control serial lines DTR is dropped and raised again after 500ms 
-   to signal the attached serial device.  
+   for non modem control serial lines DTR is dropped and raised again after 500ms
+   to signal the attached serial device.
 */
 
 static t_stat tmxr_reset_ln_ex (TMLN *lp, t_bool closeserial)
@@ -1471,7 +1471,7 @@ if ((lp->destination) && (!lp->serport)) {
     if ((!lp->modem_control) || (lp->modembits & TMXR_MDM_DTR)) {
         sprintf (msg, "tmxr_reset_ln_ex() - connecting to %s", lp->destination);
         tmxr_debug_connect_line (lp, msg);
-        lp->connecting = sim_connect_sock_ex (lp->datagram ? lp->port : NULL, lp->destination, "localhost", NULL, (lp->datagram ? SIM_SOCK_OPT_DATAGRAM : 0) | 
+        lp->connecting = sim_connect_sock_ex (lp->datagram ? lp->port : NULL, lp->destination, "localhost", NULL, (lp->datagram ? SIM_SOCK_OPT_DATAGRAM : 0) |
                                                                                                                   (lp->packet ? SIM_SOCK_OPT_NODELAY : 0));
         }
     }
@@ -1496,7 +1496,7 @@ return tmxr_reset_ln_ex (lp, FALSE);
 
    Inputs:
         none
-        
+
    Output:
         none
 
@@ -1521,8 +1521,8 @@ for (i=0; i<mp->lines; ++i) {
     TMLN *lp;
 
     lp = mp->ldsc + i;
-    if ((lp->master)     || 
-        (lp->sock)       || 
+    if ((lp->master)     ||
+        (lp->sock)       ||
         (lp->connecting) ||
         (lp->serport))
         return SCPE_ALATT;
@@ -1542,21 +1542,21 @@ return tmxr_clear_modem_control_passthru_state (mp, TRUE);
 
    Inputs:
         none
-        
+
    Output:
         none
 
    Implementation note:
 
-    1  Calling this API enables this library's direct manipulation 
+    1  Calling this API enables this library's direct manipulation
        of DTR (&RTS) on serial ports.
 
     2  Calling this API disables the tmxr_set_get_modem_bits and
        tmxr_set_config_line APIs.
 
     3  This API will only change the state of the modem control processing
-       of this library if there are no listening ports, serial ports or 
-       outgoing connecctions associated with the specified multiplexer
+       of this library if there are no listening ports, serial ports or
+       outgoing connections associated with the specified multiplexer
 
 */
 t_stat tmxr_clear_modem_control_passthru (TMXR *mp)
@@ -1569,7 +1569,7 @@ return tmxr_clear_modem_control_passthru_state (mp, FALSE);
    This would best be called in a device reset routine and left.
 
    If the device implementor wants to make this behavior a user option
-   we've got to reject the attempt to set or clear this mode if any 
+   we've got to reject the attempt to set or clear this mode if any
    ports on the MUX are attached.
 */
 static t_stat tmxr_set_notelnet_state (TMXR *mp, t_bool state)
@@ -1582,8 +1582,8 @@ for (i=0; i<mp->lines; ++i) {
     TMLN *lp;
 
     lp = mp->ldsc + i;
-    if ((lp->master)     || 
-        (lp->sock)       || 
+    if ((lp->master)     ||
+        (lp->sock)       ||
         (lp->connecting) ||
         (lp->serport))
         return SCPE_ALATT;
@@ -1598,7 +1598,7 @@ return SCPE_OK;
 
    Inputs:
         none
-        
+
    Output:
         SCPE_OK or SCPE_ALATT
 
@@ -1612,7 +1612,7 @@ return tmxr_set_notelnet_state (mp, TRUE);
 
    Inputs:
         none
-        
+
    Output:
         SCPE_OK or SCPE_ALATT
 
@@ -1628,7 +1628,7 @@ return tmxr_set_notelnet_state (mp, FALSE);
    This would best be called in a device reset routine and left.
 
    If the device implementor wants to make this behavior a user option
-   we've got to reject the attempt to set or clear this mode if any 
+   we've got to reject the attempt to set or clear this mode if any
    ports on the MUX are attached.
 */
 static t_stat tmxr_set_nomessage_state (TMXR *mp, t_bool state)
@@ -1641,8 +1641,8 @@ for (i=0; i<mp->lines; ++i) {
     TMLN *lp;
 
     lp = mp->ldsc + i;
-    if ((lp->master)     || 
-        (lp->sock)       || 
+    if ((lp->master)     ||
+        (lp->sock)       ||
         (lp->connecting) ||
         (lp->serport))
         return SCPE_ALATT;
@@ -1653,12 +1653,12 @@ for (i=0; i<mp->lines; ++i)
 return SCPE_OK;
 }
 
-/* Disable Connect time message in incoming Telnet connections to all 
+/* Disable Connect time message in incoming Telnet connections to all
    lines in a mux
 
    Inputs:
         none
-        
+
    Output:
         SCPE_OK or SCPE_ALATT
 
@@ -1668,12 +1668,12 @@ t_stat tmxr_set_nomessage (TMXR *mp)
 return tmxr_set_nomessage_state (mp, TRUE);
 }
 
-/* Enable Connect time message in incoming Telnet connections to all 
+/* Enable Connect time message in incoming Telnet connections to all
    lines in a mux
 
    Inputs:
         none
-        
+
    Output:
         SCPE_OK or SCPE_ALATT
 
@@ -1688,7 +1688,7 @@ return tmxr_set_nomessage_state (mp, FALSE);
    This would best be called in a device reset routine and left set.
 
    If the device implementor wants to make this behavior a user option
-   we've got to reject the attempt to set or clear this mode if any 
+   we've got to reject the attempt to set or clear this mode if any
    ports on the MUX are attached.
 */
 t_stat tmxr_set_port_speed_control (TMXR *mp)
@@ -1706,7 +1706,7 @@ return SCPE_OK;
 
 /* Declare that tmxr_set_config_line is not used.
 
-   This should be only be called after a previous call to 
+   This should be only be called after a previous call to
    tmxr_set_port_speed_control since the default is cleared.  It can not
    be called if any ports on the device are attached.
 */
@@ -1728,7 +1728,7 @@ return SCPE_OK;
    This would best be called in a device reset routine and left set.
 
    If the device implementor wants to make this behavior a user option
-   we've got to reject the attempt to set or clear this mode if any 
+   we've got to reject the attempt to set or clear this mode if any
    ports on the MUX are attached.
 */
 t_stat tmxr_set_line_port_speed_control (TMXR *mp, int line)
@@ -1744,7 +1744,7 @@ return SCPE_OK;
 
 /* Declare that tmxr_set_config_line is not used for line.
 
-   This should be only be called after a previous call to 
+   This should be only be called after a previous call to
    tmxr_set_port_speed_control since the default is cleared.  It can not
    be called if any ports on the device are attached.
 */
@@ -1765,7 +1765,7 @@ return SCPE_OK;
         *lp     =       pointer to terminal line descriptor
         bits_to_set     TMXR_MDM_DTR and/or TMXR_MDM_RTS as desired
         bits_to_clear   TMXR_MDM_DTR and/or TMXR_MDM_RTS as desired
-        
+
    Output:
         status_bits     if non NULL, returns all of the current signal
                         state bits (incoming: DCD, RNG, CTS, DSR) along
@@ -1845,13 +1845,13 @@ if ((lp->sock) || (lp->serport) || (lp->loopback)) {
 else {
     if (((before_modem_bits & TMXR_MDM_DTR) == 0) &&    /* Upward transition of DTR? */
         ((lp->modembits & TMXR_MDM_DTR) != 0)     &&
-        (lp->conn == FALSE)                       &&    /* Not connected */ 
+        (lp->conn == FALSE)                       &&    /* Not connected */
         (lp->modembits & TMXR_MDM_RNG)) {               /* and Ring Signal Present */
-        if ((lp->destination == NULL) && 
+        if ((lp->destination == NULL) &&
             (lp->master == 0) &&
             (lp->mp && (lp->mp->ring_sock))) {
             int ln;
-            
+
             lp->conn = TRUE;                            /* record connection */
             lp->sock = lp->mp->ring_sock;               /* save socket */
             lp->mp->ring_sock = INVALID_SOCKET;
@@ -1925,7 +1925,7 @@ if (lp->mp && lp->modem_control) {                  /* This API ONLY works on mo
 
                 sprintf (msg, "tmxr_set_get_modem_bits() - establishing outgoing connection to: %s", lp->destination);
                 tmxr_debug_connect_line (lp, msg);
-                lp->connecting = sim_connect_sock_ex (lp->datagram ? lp->port : NULL, lp->destination, "localhost", NULL, (lp->datagram ? SIM_SOCK_OPT_DATAGRAM : 0) | 
+                lp->connecting = sim_connect_sock_ex (lp->datagram ? lp->port : NULL, lp->destination, "localhost", NULL, (lp->datagram ? SIM_SOCK_OPT_DATAGRAM : 0) |
                                                                                                                           (lp->packet ? SIM_SOCK_OPT_NODELAY : 0));
                 }
             }
@@ -1955,9 +1955,9 @@ return SCPE_INCOMP;
 
    Implementation note:
 
-    1) When enabling loopback mode, this API will disconnect any currently 
+    1) When enabling loopback mode, this API will disconnect any currently
        connected TCP or Serial session.
-    2) When disabling loopback mode, prior network connections and/or 
+    2) When disabling loopback mode, prior network connections and/or
        serial port connections will be restored.
 
 */
@@ -2053,7 +2053,7 @@ return r;
    Inputs:
         *lp     =       pointer to terminal line descriptor
    Output:
-        (TMXR_VALID | char) or 0 if no data is currently available 
+        (TMXR_VALID | char) or 0 if no data is currently available
                             on the specified line.
 
    Implementation note:
@@ -2065,7 +2065,7 @@ return r;
 
 int32 tmxr_getc_ln (TMLN *lp)
 {
-int32 j; 
+int32 j;
 t_stat val = 0;
 uint32 tmp;
 double sim_gtime_now = sim_gtime ();
@@ -2139,7 +2139,7 @@ while (TMXR_VALID & (c = tmxr_getc_ln (lp))) {
         continue;
         }
     if ((lp->datagram) && (lp->rxpboffset == fc_size)) {
-        /* Datagram packet length is provided as a part of the natural datagram 
+        /* Datagram packet length is provided as a part of the natural datagram
            delivery, for TCP lines, we read the packet length from the data stream.
            So, here we stuff packet size into head of packet buffer so it looks like
            it was delivered by TCP and the below return logic doesn't have to worry */
@@ -2181,7 +2181,7 @@ TMLN *lp;
 tmxr_debug_trace (mp, "tmxr_poll_rx()");
 for (i = 0; i < mp->lines; i++) {                       /* loop thru lines */
     lp = mp->ldsc + i;                                  /* get line desc */
-    if (!(lp->sock || lp->serport || lp->loopback || lp->framer) || 
+    if (!(lp->sock || lp->serport || lp->loopback || lp->framer) ||
         !(lp->rcve))                                    /* skip if not connected */
         continue;
 
@@ -2197,7 +2197,7 @@ for (i = 0; i < mp->lines; i++) {                       /* loop thru lines */
 
     if (nbytes < 0) {                                   /* line error? */
         if (!lp->datagram) {                            /* ignore errors reading UDP sockets */
-            if (!lp->txbfd || lp->notelnet) 
+            if (!lp->txbfd || lp->notelnet)
                 lp->txbpi = lp->txbpr = 0;              /* Drop the data we already know we can't send */
             tmxr_close_ln (lp);                         /* disconnect line */
             }
@@ -2256,9 +2256,9 @@ for (i = 0; i < mp->lines; i++) {                       /* loop thru lines */
                         lp->tsta = TNS_SKIP;            /* IAC + other */
                         break;
                     case TN_GA: case TN_EL:             /* IAC + other 2 byte types */
-                    case TN_EC: case TN_AYT:    
+                    case TN_EC: case TN_AYT:
                     case TN_AO: case TN_IP:
-                    case TN_NOP: 
+                    case TN_NOP:
                         lp->tsta = TNS_NORM;            /* ignore */
                         break;
                     case TN_SB:                         /* IAC + SB sub-opt negotiation */
@@ -2271,46 +2271,46 @@ for (i = 0; i < mp->lines; i++) {                       /* loop thru lines */
                     break;
 
                 case TNS_WILL:                          /* IAC+WILL prev */
-                    if ((tmp == TN_STATUS) || 
-                        (tmp == TN_TIMING) || 
-                        (tmp == TN_NAOCRD) || 
-                        (tmp == TN_NAOHTS) || 
-                        (tmp == TN_NAOHTD) || 
-                        (tmp == TN_NAOFFD) || 
-                        (tmp == TN_NAOVTS) || 
-                        (tmp == TN_NAOVTD) || 
-                        (tmp == TN_NAOLFD) || 
-                        (tmp == TN_EXTEND) || 
-                        (tmp == TN_LOGOUT) || 
-                        (tmp == TN_BM)     || 
-                        (tmp == TN_DET)    || 
-                        (tmp == TN_SENDLO) || 
-                        (tmp == TN_TERMTY) || 
-                        (tmp == TN_ENDREC) || 
-                        (tmp == TN_TUID)   || 
-                        (tmp == TN_OUTMRK) || 
-                        (tmp == TN_TTYLOC) || 
-                        (tmp == TN_3270)   || 
-                        (tmp == TN_X3PAD)  || 
-                        (tmp == TN_NAWS)   || 
-                        (tmp == TN_TERMSP) || 
-                        (tmp == TN_TOGFLO) || 
-                        (tmp == TN_XDISPL) || 
-                        (tmp == TN_ENVIRO) || 
-                        (tmp == TN_AUTH)   || 
-                        (tmp == TN_ENCRYP) || 
-                        (tmp == TN_NEWENV) || 
-                        (tmp == TN_TN3270) || 
-                        (tmp == TN_CHARST) || 
-                        (tmp == TN_COMPRT) || 
+                    if ((tmp == TN_STATUS) ||
+                        (tmp == TN_TIMING) ||
+                        (tmp == TN_NAOCRD) ||
+                        (tmp == TN_NAOHTS) ||
+                        (tmp == TN_NAOHTD) ||
+                        (tmp == TN_NAOFFD) ||
+                        (tmp == TN_NAOVTS) ||
+                        (tmp == TN_NAOVTD) ||
+                        (tmp == TN_NAOLFD) ||
+                        (tmp == TN_EXTEND) ||
+                        (tmp == TN_LOGOUT) ||
+                        (tmp == TN_BM)     ||
+                        (tmp == TN_DET)    ||
+                        (tmp == TN_SENDLO) ||
+                        (tmp == TN_TERMTY) ||
+                        (tmp == TN_ENDREC) ||
+                        (tmp == TN_TUID)   ||
+                        (tmp == TN_OUTMRK) ||
+                        (tmp == TN_TTYLOC) ||
+                        (tmp == TN_3270)   ||
+                        (tmp == TN_X3PAD)  ||
+                        (tmp == TN_NAWS)   ||
+                        (tmp == TN_TERMSP) ||
+                        (tmp == TN_TOGFLO) ||
+                        (tmp == TN_XDISPL) ||
+                        (tmp == TN_ENVIRO) ||
+                        (tmp == TN_AUTH)   ||
+                        (tmp == TN_ENCRYP) ||
+                        (tmp == TN_NEWENV) ||
+                        (tmp == TN_TN3270) ||
+                        (tmp == TN_CHARST) ||
+                        (tmp == TN_COMPRT) ||
                         (tmp == TN_KERMIT)) {
                         /* Reject (DONT) these 'uninteresting' options only one time to avoid loops */
                         if (0 == (lp->telnet_sent_opts[tmp] & TNOS_DONT)) {
                             lp->notelnet = TRUE;                /* Temporarily disable so */
                             tmxr_putc_ln (lp, TN_IAC);          /* IAC gets injected bare */
                             lp->notelnet = FALSE;
-                            tmxr_putc_ln (lp, TN_DONT); 
-                            tmxr_putc_ln (lp, tmp); 
+                            tmxr_putc_ln (lp, TN_DONT);
+                            tmxr_putc_ln (lp, tmp);
                             lp->telnet_sent_opts[tmp] |= TNOS_DONT;/* Record DONT sent */
                             }
                         }
@@ -2350,46 +2350,46 @@ for (i = 0; i < mp->lines; i++) {                       /* loop thru lines */
                     break;
 
                 case TNS_DO:                            /* pending DO request */
-                    if ((tmp == TN_STATUS) || 
-                        (tmp == TN_TIMING) || 
-                        (tmp == TN_NAOCRD) || 
-                        (tmp == TN_NAOHTS) || 
-                        (tmp == TN_NAOHTD) || 
-                        (tmp == TN_NAOFFD) || 
-                        (tmp == TN_NAOVTS) || 
-                        (tmp == TN_NAOVTD) || 
-                        (tmp == TN_NAOLFD) || 
-                        (tmp == TN_EXTEND) || 
-                        (tmp == TN_LOGOUT) || 
-                        (tmp == TN_BM)     || 
-                        (tmp == TN_DET)    || 
-                        (tmp == TN_SENDLO) || 
-                        (tmp == TN_TERMTY) || 
-                        (tmp == TN_ENDREC) || 
-                        (tmp == TN_TUID)   || 
-                        (tmp == TN_OUTMRK) || 
-                        (tmp == TN_TTYLOC) || 
-                        (tmp == TN_3270)   || 
-                        (tmp == TN_X3PAD)  || 
-                        (tmp == TN_NAWS)   || 
-                        (tmp == TN_TERMSP) || 
-                        (tmp == TN_TOGFLO) || 
-                        (tmp == TN_XDISPL) || 
-                        (tmp == TN_ENVIRO) || 
-                        (tmp == TN_AUTH)   || 
-                        (tmp == TN_ENCRYP) || 
-                        (tmp == TN_NEWENV) || 
-                        (tmp == TN_TN3270) || 
-                        (tmp == TN_CHARST) || 
-                        (tmp == TN_COMPRT) || 
+                    if ((tmp == TN_STATUS) ||
+                        (tmp == TN_TIMING) ||
+                        (tmp == TN_NAOCRD) ||
+                        (tmp == TN_NAOHTS) ||
+                        (tmp == TN_NAOHTD) ||
+                        (tmp == TN_NAOFFD) ||
+                        (tmp == TN_NAOVTS) ||
+                        (tmp == TN_NAOVTD) ||
+                        (tmp == TN_NAOLFD) ||
+                        (tmp == TN_EXTEND) ||
+                        (tmp == TN_LOGOUT) ||
+                        (tmp == TN_BM)     ||
+                        (tmp == TN_DET)    ||
+                        (tmp == TN_SENDLO) ||
+                        (tmp == TN_TERMTY) ||
+                        (tmp == TN_ENDREC) ||
+                        (tmp == TN_TUID)   ||
+                        (tmp == TN_OUTMRK) ||
+                        (tmp == TN_TTYLOC) ||
+                        (tmp == TN_3270)   ||
+                        (tmp == TN_X3PAD)  ||
+                        (tmp == TN_NAWS)   ||
+                        (tmp == TN_TERMSP) ||
+                        (tmp == TN_TOGFLO) ||
+                        (tmp == TN_XDISPL) ||
+                        (tmp == TN_ENVIRO) ||
+                        (tmp == TN_AUTH)   ||
+                        (tmp == TN_ENCRYP) ||
+                        (tmp == TN_NEWENV) ||
+                        (tmp == TN_TN3270) ||
+                        (tmp == TN_CHARST) ||
+                        (tmp == TN_COMPRT) ||
                         (tmp == TN_KERMIT)) {
                         /* Reject (WONT) these 'uninteresting' options only one time to avoid loops */
                         if (0 == (lp->telnet_sent_opts[tmp] & TNOS_WONT)) {
                             lp->notelnet = TRUE;                /* Temporarily disable so */
                             tmxr_putc_ln (lp, TN_IAC);          /* IAC gets injected bare */
                             lp->notelnet = FALSE;
-                            tmxr_putc_ln (lp, TN_WONT); 
-                            tmxr_putc_ln (lp, tmp); 
+                            tmxr_putc_ln (lp, TN_WONT);
+                            tmxr_putc_ln (lp, tmp);
                             if (lp->conn)                       /* Still connected ? */
                                 lp->telnet_sent_opts[tmp] |= TNOS_WONT;/* Record WONT sent */
                             }
@@ -2483,7 +2483,7 @@ if ((lp->conn && (TXBUF_AVAIL(lp) > 1)) ||              /* connected and room fo
     if ((TN_IAC == (u_char) chr) && (!lp->notelnet))    /* char == IAC in telnet session? */
         TXBUF_CHAR (lp, TN_IAC);                        /* stuff extra IAC char */
     TXBUF_CHAR (lp, chr);                               /* buffer char & adv pointer */
-    if (((!lp->txbfd) && 
+    if (((!lp->txbfd) &&
          (TXBUF_AVAIL (lp) <= TMXR_GUARD)) ||           /* near full? */
         (lp->txbps))                                    /* or we're rate limiting output */
         lp->xmte = 0;                                   /* disable line transmit until space available or character time has passed */
@@ -2493,14 +2493,14 @@ if ((lp->conn && (TXBUF_AVAIL(lp) > 1)) ||              /* connected and room fo
 
         sim_oline = NULL;                               /* save output socket */
         fputc (chr, lp->txlog);                         /* log to actual file */
-        sim_oline = save_oline;                         /* resture output socket */
+        sim_oline = save_oline;                         /* restore output socket */
         }
     sim_exp_check (&lp->expect, chr);                   /* process expect rules as needed */
     if (!sim_is_running &&                              /* attach message or other non simulation time message? */
-        !sim_is_remote_console_master_line (lp)) {                              
+        !sim_is_remote_console_master_line (lp)) {
         tmxr_send_buffered_data (lp);                   /* put data on wire */
         sim_os_ms_sleep(((lp->txbps) && (lp->txdeltausecs > 1000)) ? /* rate limiting output slower than 1000 cps */
-                        (lp->txdeltausecs - 1000) / 1000 : 
+                        (lp->txdeltausecs - 1000) / 1000 :
                         1);                             /* wait an approximate character delay */
         }
     return SCPE_OK;                                     /* char sent */
@@ -2515,15 +2515,15 @@ return SCPE_STALL;                                      /* char not sent */
         *lp     =       pointer to line descriptor
         *buf    =       pointer to packet data
         size    =       size of packet
-        frame_char =    inter-packet franing character (0 means no frame character)
+        frame_char =    inter-packet framing character (0 means no frame character)
 
    Outputs:
         status  =       ok, connection lost, or stall
 
-   Implementation notea:
+   Implementation notes:
 
     1. If the line is not connected, SCPE_LOST is returned.
-    2. If prior packet transmission still in progress, SCPE_STALL is 
+    2. If prior packet transmission still in progress, SCPE_STALL is
        returned and no packet data is stored.  The caller must retry later.
 */
 t_stat tmxr_put_packet_ln (TMLN *lp, const uint8 *buf, size_t size)
@@ -2557,7 +2557,7 @@ lp->txppsize = size + pktlen_size + fc_size;
 lp->txppoffset = 0;
 tmxr_debug (TMXR_DBG_PXMT, lp, "Sending Packet", (char *)&lp->txpb[pktlen_size+fc_size], size);
 ++lp->txpcnt;
-while ((lp->txppoffset < lp->txppsize) && 
+while ((lp->txppoffset < lp->txppsize) &&
        (SCPE_OK == (r = tmxr_putc_ln (lp, lp->txpb[lp->txppoffset]))))
    ++lp->txppoffset;
 tmxr_send_buffered_data (lp);
@@ -2592,7 +2592,7 @@ for (i = 0; i < mp->lines; i++) {                       /* loop thru lines */
             tmxr_rqln (lp))
             _sim_activate (ruptr, 0);
 #endif
-        if ((lp->xmte == 0) && 
+        if ((lp->xmte == 0) &&
             ((lp->txbps == 0) ||
              (lp->txnexttime <= sim_gtime_now)))
             lp->xmte = 1;                               /* enable line transmit */
@@ -2688,7 +2688,7 @@ int32 tmxr_txdone_ln (TMLN *lp)
 if (lp->txdone)
     return -1;                      /* previously done */
 if ((lp->conn == 0) ||
-    (lp->txbps == 0) || 
+    (lp->txbps == 0) ||
     (lp->txnexttime <= sim_gtime ())) {
     lp->txdone = TRUE;              /* done now */
     return 1;
@@ -2891,10 +2891,10 @@ static const char* _tmxr_getname(int number, char* name)
 
    A listening socket for the port number described by "cptr" is opened for the
    multiplexer associated with descriptor "mp".  If the open is successful, all
-   lines not currently otherwise connected (via serial, outgoing or direct 
+   lines not currently otherwise connected (via serial, outgoing or direct
    listener) are initialized for Telnet connections.
 
-   Initialization for all connection styles (MUX wide listener, per line serial, 
+   Initialization for all connection styles (MUX wide listener, per line serial,
    listener, outgoing, logging, buffering) are handled by this routine.
 
 */
@@ -2902,8 +2902,8 @@ static const char* _tmxr_getname(int number, char* name)
 t_stat tmxr_open_master (TMXR *mp, CONST char *cptr)
 {
 int32 i, line, nextline = -1;
-char tbuf[CBUFSIZE], listen[CBUFSIZE], destination[CBUFSIZE], 
-     logfiletmpl[CBUFSIZE], buffered[CBUFSIZE], hostport[CBUFSIZE], 
+char tbuf[CBUFSIZE], listen[CBUFSIZE], destination[CBUFSIZE],
+     logfiletmpl[CBUFSIZE], buffered[CBUFSIZE], hostport[CBUFSIZE],
      port[CBUFSIZE], option[CBUFSIZE], speed[CBUFSIZE], dev_name[CBUFSIZE],
      acl[CBUFSIZE];
 char framer[CBUFSIZE],fr_eth[CBUFSIZE];
@@ -2987,7 +2987,7 @@ while (*tptr) {
                 loopback = TRUE;
                 continue;
                 }
-           if ((0 == MATCH_CMD (gbuf, "NOBUFFERED")) || 
+           if ((0 == MATCH_CMD (gbuf, "NOBUFFERED")) ||
                 (0 == MATCH_CMD (gbuf, "UNBUFFERED"))) {
                 if ((NULL != cptr) && ('\0' != *cptr))
                     return sim_messagef (SCPE_2MARG, "Unexpected Unbuffered Specifier: %s\n", cptr);
@@ -3061,11 +3061,11 @@ while (*tptr) {
                 continue;
                 }
             if (0 == MATCH_CMD (gbuf, "SPEED")) {
-                if ((NULL == cptr) || ('\0' == *cptr) || 
+                if ((NULL == cptr) || ('\0' == *cptr) ||
                     (_tmln_speed_delta (cptr) < 0))
                     return sim_messagef (SCPE_ARG, "Invalid Speed Specifier: %s\n", (cptr ? cptr : ""));
-                if (mp->port_speed_control && 
-                    ((_tmln_speed_delta (cptr) > 0) || (*cptr != '*')) && 
+                if (mp->port_speed_control &&
+                    ((_tmln_speed_delta (cptr) > 0) || (*cptr != '*')) &&
                     (!(sim_switches & SIM_SW_REST)))
                     return sim_messagef (SCPE_ARG, "%s simulator programmatically sets %sport speed\n", sim_name, dev_name);
                 strlcpy (speed, cptr, sizeof(speed));
@@ -3195,7 +3195,7 @@ while (*tptr) {
                         else
                             return sim_messagef (SCPE_ARG, "Unexpected specifier: %s\n", eptr);
                 }
-            sock = sim_connect_sock_ex (NULL, hostport, "localhost", NULL, (datagram ? SIM_SOCK_OPT_DATAGRAM : 0) | 
+            sock = sim_connect_sock_ex (NULL, hostport, "localhost", NULL, (datagram ? SIM_SOCK_OPT_DATAGRAM : 0) |
                                                                            (packet ? SIM_SOCK_OPT_NODELAY : 0));
             if (sock != INVALID_SOCKET)
                 sim_close_sock (sock);
@@ -3205,9 +3205,9 @@ while (*tptr) {
         }
     if (framer[0]) {
         if (listen[0] || loopback || (!notelnet) || (!datagram))
-            return sim_messagef (SCPE_ARG, "Can't combined SYNC=%s with%s%s%s%s%s\n", framer, 
-                    listen[0] ? " " : "", listen, loopback ? " LOOPBACK" : "", 
-                                                  notelnet ? "" : " TELNET", 
+            return sim_messagef (SCPE_ARG, "Can't combined SYNC=%s with%s%s%s%s%s\n", framer,
+                    listen[0] ? " " : "", listen, loopback ? " LOOPBACK" : "",
+                                                  notelnet ? "" : " TELNET",
                                                   datagram ? "" : " STREAM");
         /* Validate framer spec */
         cptr = get_glyph_nc (framer, fr_eth, ':');
@@ -3218,10 +3218,10 @@ while (*tptr) {
         else {
             if (0 == MATCH_CMD (option, "LOOPBACK"))
                 fr_mode = 1 | 4;  /* Integral modem, loopback */
-            else 
+            else
                 if (0 == MATCH_CMD (option, "RS232_DCE"))
                     fr_mode = 2;
-                else 
+                else
                     if (0 == MATCH_CMD (option, "RS232_DTE"))
                         fr_mode = 0;
                     else
@@ -3406,7 +3406,7 @@ while (*tptr) {
                         return sim_messagef (SCPE_ARG, "Missing listen port for Datagram socket\n");
                     }
                 lp->packet = packet;
-                sock = sim_connect_sock_ex (datagram ? listen : NULL, hostport, "localhost", NULL, (datagram ? SIM_SOCK_OPT_DATAGRAM : 0) | 
+                sock = sim_connect_sock_ex (datagram ? listen : NULL, hostport, "localhost", NULL, (datagram ? SIM_SOCK_OPT_DATAGRAM : 0) |
                                                                                                    (packet ? SIM_SOCK_OPT_NODELAY : 0));
                 if (sock != INVALID_SOCKET) {
                     _mux_detach_line (lp, FALSE, TRUE);
@@ -3432,7 +3432,7 @@ while (*tptr) {
                 }
             }
         if (speed[0] &&
-            (destination[0] == '\0') && 
+            (destination[0] == '\0') &&
             (listen[0] == '\0') &&
             (!loopback)) {
             for (i = 0; i < mp->lines; i++) {
@@ -3581,7 +3581,7 @@ while (*tptr) {
                         else
                             return sim_messagef (SCPE_ARG, "Missing listen port for Datagram socket\n");
                         }
-                    sock = sim_connect_sock_ex (datagram ? listen : NULL, hostport, "localhost", NULL, (datagram ? SIM_SOCK_OPT_DATAGRAM : 0) | 
+                    sock = sim_connect_sock_ex (datagram ? listen : NULL, hostport, "localhost", NULL, (datagram ? SIM_SOCK_OPT_DATAGRAM : 0) |
                                                                                                        (packet ? SIM_SOCK_OPT_NODELAY : 0));
                     if (sock != INVALID_SOCKET) {
                         _mux_detach_line (lp, FALSE, TRUE);
@@ -3621,7 +3621,7 @@ return r;
 }
 
 
-/* Declare which unit polls for input 
+/* Declare which unit polls for input
 
    Inputs:
         *mp     =       the mux
@@ -3669,7 +3669,7 @@ return SCPE_OK;
       - This routine must be called before the MUX is attached.
       - Only devices which poll on a unit different from the unit provided
         at MUX attach time need call this function ABD different from the
-        unit which polls for input.  Calling this API is necessary for 
+        unit which polls for input.  Calling this API is necessary for
         asynchronous multiplexer support and if speed limited behaviors are
         desired.
 
@@ -3699,7 +3699,7 @@ return SCPE_OK;
 
    Implementation note:
 
-        This routine is exported by the tmxr library so that it gets 
+        This routine is exported by the tmxr library so that it gets
         defined to code which uses it by including sim_tmxr.h.  Including
         sim_tmxr.h is necessary so that sim_activate is properly defined
         in the caller's code to actually call tmxr_activate.
@@ -3742,8 +3742,8 @@ UNIT **activated = NULL;
 SOCKET *sockets = NULL;
 int wait_count = 0;
 
-/* Boost Priority for this I/O thread vs the CPU instruction execution 
-   thread which, in general, won't be readily yielding the processor when 
+/* Boost Priority for this I/O thread vs the CPU instruction execution
+   thread which, in general, won't be readily yielding the processor when
    this thread needs to run */
 sim_os_set_thread_priority (PRIORITY_ABOVE_NORMAL);
 
@@ -3874,13 +3874,13 @@ while (sim_asynch_enabled) {
                     if ((mp->ldsc[j].conn) && (mp->ldsc[j].uptr)) {
                         if (tmxr_tqln(&mp->ldsc[j]) || tmxr_rqln (&mp->ldsc[j])) {
                             timeout_usec = 10000; /* Wait 10ms next time (this gets doubled below) */
-                            /* More than one socket can be associated with the 
+                            /* More than one socket can be associated with the
                                same unit.  Make sure to only activate it one time */
                             if (!mp->ldsc[j].uptr->a_polling_now) {
                                 mp->ldsc[j].uptr->a_polling_now = TRUE;
                                 mp->ldsc[j].uptr->a_poll_waiter_count = 0;
                                 d = find_dev_from_unit(mp->ldsc[j].uptr);
-                                sim_debug (TMXR_DBG_ASY, d, "_tmxr_poll() - Line %d Activating %s to poll data: %d/%d\n", 
+                                sim_debug (TMXR_DBG_ASY, d, "_tmxr_poll() - Line %d Activating %s to poll data: %d/%d\n",
                                     j, sim_uname(mp->ldsc[j].uptr), tmxr_tqln(&mp->ldsc[j]), tmxr_rqln (&mp->ldsc[j]));
                                 pthread_mutex_unlock (&sim_tmxr_poll_lock);
                                 _sim_activate (mp->ldsc[j].uptr, 0);
@@ -3891,7 +3891,7 @@ while (sim_asynch_enabled) {
                     }
                 }
             sim_debug (TMXR_DBG_ASY, dptr, "_tmxr_poll() - Poll Timeout - %dms\n", timeout_usec/1000);
-            timeout_usec *= 2;     /* Double timeout time */  
+            timeout_usec *= 2;     /* Double timeout time */
             break;
         case SOCKET_ERROR:
             wait_count = 0;
@@ -3903,9 +3903,9 @@ while (sim_asynch_enabled) {
         default:
             wait_count = 0;
             for (i=0; i<socket_count; ++i) {
-                if (FD_ISSET(sockets[i], &readfds) || 
+                if (FD_ISSET(sockets[i], &readfds) ||
                     FD_ISSET(sockets[i], &errorfds)) {
-                    /* More than one socket can be associated with the 
+                    /* More than one socket can be associated with the
                        same unit.  Only activate one time */
                     for (j=0; j<wait_count; ++j)
                         if (activated[j] == units[i])
@@ -3957,8 +3957,8 @@ UNIT **activated = NULL;
 SERHANDLE *serports = NULL;
 int wait_count = 0;
 
-/* Boost Priority for this I/O thread vs the CPU instruction execution 
-   thread which, in general, won't be readily yielding the processor when 
+/* Boost Priority for this I/O thread vs the CPU instruction execution
+   thread which, in general, won't be readily yielding the processor when
    this thread needs to run */
 sim_os_set_thread_priority (PRIORITY_ABOVE_NORMAL);
 
@@ -4019,7 +4019,7 @@ while (sim_asynch_enabled) {
             break;
         case WAIT_TIMEOUT:
             sim_debug (TMXR_DBG_ASY, dptr, "_tmxr_serial_poll() - Poll Timeout - %dms\n", timeout_usec/1000);
-            timeout_usec *= 2;     /* Double timeout time */  
+            timeout_usec *= 2;     /* Double timeout time */
             break;
         default:
             i = status - WAIT_OBJECT_0;
@@ -4087,8 +4087,8 @@ UNIT *uptr = (lp->uptr ? lp->uptr : lp->mp->uptr);
 DEVICE *d = find_dev_from_unit(uptr);
 int wait_count = 0;
 
-/* Boost Priority for this I/O thread vs the CPU instruction execution 
-   thread which, in general, won't be readily yielding the processor when 
+/* Boost Priority for this I/O thread vs the CPU instruction execution
+   thread which, in general, won't be readily yielding the processor when
    this thread needs to run */
 sim_os_set_thread_priority (PRIORITY_ABOVE_NORMAL);
 
@@ -4121,7 +4121,7 @@ while (sim_asynch_enabled) {
     lp->a_active = TRUE;
     pthread_mutex_unlock (&sim_tmxr_poll_lock);
     term[0] = term[1] = 0;
-    status = sys$qiow (0, lp->serport, 
+    status = sys$qiow (0, lp->serport,
                        IO$_READLBLK | IO$M_NOECHO | IO$M_NOFILTR | IO$M_TIMED | IO$M_TRMNOECHO,
                        &iosb, 0, 0, buf, 1, 1, term, 0, 0);
     if (status != SS$_NORMAL) {
@@ -4165,8 +4165,8 @@ DEVICE *dptr = tmxr_open_devices[0]->dptr;
 TMLN **lines = NULL;
 pthread_t *threads = NULL;
 
-/* Boost Priority for this I/O thread vs the CPU instruction execution 
-   thread which, in general, won't be readily yielding the processor when 
+/* Boost Priority for this I/O thread vs the CPU instruction execution
+   thread which, in general, won't be readily yielding the processor when
    this thread needs to run */
 
 sim_debug (TMXR_DBG_ASY, dptr, "_tmxr_serial_poll() - starting\n");
@@ -4223,9 +4223,9 @@ t_stat tmxr_start_poll (void)
 {
 #if defined(SIM_ASYNCH_MUX)
 pthread_mutex_lock (&sim_tmxr_poll_lock);
-if ((tmxr_open_device_count > 0) && 
-    sim_asynch_enabled           && 
-    sim_is_running               && 
+if ((tmxr_open_device_count > 0) &&
+    sim_asynch_enabled           &&
+    sim_is_running               &&
     !sim_tmxr_poll_running) {
     pthread_attr_t attr;
 
@@ -4451,7 +4451,7 @@ if (r != SCPE_OK)                                       /* error? */
     return r;
 uptr->filename = tmxr_mux_attach_string (uptr->filename, mp);/* save */
 if (uptr->filename == NULL)                             /* avoid dangling NULL pointer */
-    uptr->filename = (char *)calloc (1, 1);             /* provide an emptry string */
+    uptr->filename = (char *)calloc (1, 1);             /* provide an empty string */
 uptr->flags = uptr->flags | UNIT_ATT;                   /* no more errors */
 uptr->tmxr = (void *)mp;
 if ((mp->lines > 1) ||
@@ -4634,7 +4634,7 @@ else {
                 break;
             }
         }
-    if ((gbuf[0] != '\0') && 
+    if ((gbuf[0] != '\0') &&
         (i == tmxr_open_device_count))
         return sim_messagef (SCPE_ARG, "Multiplexer device %s not found or attached\n", gbuf);
     }
@@ -4727,11 +4727,11 @@ return SCPE_OK;
 }
 
 
-/* Detach unit from master socket and close all active network connections 
+/* Detach unit from master socket and close all active network connections
    and/or serial ports.
 
    Note that we return SCPE_OK, regardless of whether a listening socket was
-   attached.  
+   attached.
 */
 
 t_stat tmxr_detach (TMXR *mp, UNIT *uptr)
@@ -4850,7 +4850,7 @@ if (!(uptr->dynflags & UNIT_TM_POLL))
 sooner = _tmxr_activate_delay (uptr, 0x7FFFFFFF);
 if (sooner != 0x7FFFFFFF) {
     if (sooner < 0) {
-        sim_debug (TIMER_DBG_MUX, &sim_timer_dev, "tmxr_activate_after() - scheduling %s for %u usecs produced overflow interval %d instructions, sceduling for %d instructions\n", sim_uname (uptr), usecs_walltime, sooner, 0x7FFFFFFF);
+        sim_debug (TIMER_DBG_MUX, &sim_timer_dev, "tmxr_activate_after() - scheduling %s for %u usecs produced overflow interval %d instructions, scheduling for %d instructions\n", sim_uname (uptr), usecs_walltime, sooner, 0x7FFFFFFF);
         sooner = _tmxr_activate_delay (uptr, 0x7FFFFFFF);   /* Breakpoint here on unexpected value */
         }
     sim_debug (TIMER_DBG_MUX, &sim_timer_dev, "tmxr_activate_after() - scheduling %s after %d instructions rather than %u usecs\n", sim_uname (uptr), sooner, usecs_walltime);
@@ -5134,11 +5134,11 @@ else {
     fprintf (st, "while processing the list, the end is reached the connection will be\n");
     fprintf (st, "rejected.\n\n");
     }
-fprintf (st, "Direct computer to computer connections (Virutal Null Modem cables) may\n");
+fprintf (st, "Direct computer to computer connections (Virtual Null Modem cables) may\n");
 fprintf (st, "be established using the telnet protocol or via raw tcp sockets.\n\n");
 fprintf (st, "   sim> ATTACH %s Line=n,Connect=host:port{;notelnet}|{;nomessage}\n\n", dptr->name);
 fprintf (st, "Computer to computer virtual connections can be one way (as illustrated\n");
-fprintf (st, "above) or symmetric.  A symmetric connection is configured by combining\n"); 
+fprintf (st, "above) or symmetric.  A symmetric connection is configured by combining\n");
 if (single_line) {          /* Single Line Multiplexer */
     fprintf (st, "a one way connection with a tcp listening port on the same line:\n\n");
     fprintf (st, "   sim> ATTACH %s listenport,Connect=host:port\n\n", dptr->name);
@@ -5396,7 +5396,7 @@ else {
 if (lp->txbfd)
     fprintf (st, "  output buffer size = %d\n", lp->txbsz);
 if (lp->txcnt || lp->txbpi)
-    fprintf (st, "  bytes in buffer = %d\n", 
+    fprintf (st, "  bytes in buffer = %d\n",
                ((lp->txcnt > 0) && (lp->txcnt > lp->txbsz)) ? lp->txbsz : lp->txbpi);
 if (lp->txdrp)
     fprintf (st, "  dropped = %d\n", lp->txdrp);
@@ -5636,7 +5636,7 @@ idx = 0;                                                /* initialize the index
 
 while (*cptr != '\0') {                                     /* while characters remain in the command string */
     if (strncasecmp (cptr, "ALL;", 4) == 0) {               /*   if the parameter is "ALL" */
-        if ((val != 0) || ((idx > 0) && (idx <= max)))      /*     then if some lines are restrictied or unspecified */
+        if ((val != 0) || ((idx > 0) && (idx <= max)))      /*     then if some lines are restricted or unspecified */
             for (line = (uint32)min; line <= (uint32)max; line++)/*  then fill them in sequentially */
                 if (set [line] == FALSE)                    /*         setting each unspecified line */
                     list [idx++] = line;                    /*           into the line order */
@@ -5657,8 +5657,8 @@ while (*cptr != '\0') {                                     /* while characters
         break;                                          /*     and terminate the parse */
         }
 
-    else if ((low < min) || 
-             (low > max) || 
+    else if ((low < min) ||
+             (low > max) ||
              (high > max)) {                            /* otherwise if the line number is invalid */
         result = SCPE_SUB;                              /*   then report the subscript is out of range */
         break;                                          /*     and terminate the parse */
@@ -5782,7 +5782,7 @@ int32 i, any;
 if (mp == NULL)
     return SCPE_IERR;
 for (i = any = 0; i < mp->lines; i++) {
-    if ((mp->ldsc[i].sock != 0) || 
+    if ((mp->ldsc[i].sock != 0) ||
         (mp->ldsc[i].serport != 0) || mp->ldsc[i].modem_control) {
         if ((mp->ldsc[i].sock != 0) || (mp->ldsc[i].serport != 0))
             any++;
@@ -5816,7 +5816,7 @@ t_stat tmxr_show_sync (FILE* st, UNIT* uptr, int32 val, CONST void *desc)
     fprintf(st, "  network support not available in simulator\n");
   else
     if (number == 0)
-      fprintf(st, "  no dddcmp synchronous link devices are available\n");
+      fprintf(st, "  no ddcmp synchronous link devices are available\n");
     else {
       int i;
       for (i=0; i<number; i++) {
@@ -5870,7 +5870,7 @@ static struct {
         {TN_NAOCRD, "TN_NAOCRD"},             /* Output Carriage-Return Disposition */
         {TN_NAOHTS, "TN_NAOHTS"},             /* Output Horizontal Tab Stops */
         {TN_NAOHTD, "TN_NAOHTD"},             /* Output Horizontal Tab Stop Disposition */
-        {TN_NAOFFD, "TN_NAOFFD"},             /* Output Forfeed Disposition */
+        {TN_NAOFFD, "TN_NAOFFD"},             /* Output Formfeed Disposition */
         {TN_NAOVTS, "TN_NAOVTS"},             /* Output Vertical Tab Stop */
         {TN_NAOVTD, "TN_NAOVTD"},             /* Output Vertical Tab Stop Disposition */
         {TN_NAOLFD, "TN_NAOLFD"},             /* Output Linefeed Disposition */
@@ -6102,7 +6102,7 @@ static struct lnorder_test {
                {  -1}},
     };
 
-static t_stat _lnorder_test (TMXR *tmxr, 
+static t_stat _lnorder_test (TMXR *tmxr,
                              struct lnorder_test *t)
 {
 t_stat r;
diff --git a/sim_tmxr.h b/sim_tmxr.h
index 9202f2a..2d88a67 100644
--- a/sim_tmxr.h
+++ b/sim_tmxr.h
@@ -26,7 +26,7 @@
    Based on the original DZ11 simulator by Thord Nilson, as updated by
    Arthur Krewat.
 
-   10-Oct-12    MP      Added extended attach support for serial, per line 
+   10-Oct-12    MP      Added extended attach support for serial, per line
                         listener and outgoing connections
    17-Jan-11    MP      Added buffered line capabilities
    20-Nov-08    RMS     Added three new standardized SHOW routines
@@ -96,7 +96,7 @@ typedef struct SERPORT *SERHANDLE;
 #define TMUF_NOASYNCH     (1u << TMUF_V_NOASYNCH)       /* This flag can be defined */
                                                         /* statically in a unit's flag field */
                                                         /* This will disable the unit from */
-                                                        /* supporting asynchronmous mux behaviors */
+                                                        /* supporting asynchronous mux behaviors */
 /* Receive line speed limits */
 
 #define TMLN_SPD_50_BPS     200000 /* usec per character */
@@ -125,7 +125,7 @@ typedef struct SERPORT *SERHANDLE;
 #define TMLN_SPD_115200_BPS     86 /* usec per character */
 
 /* Internal struct */
-struct framer_data;    
+struct framer_data;
 
 typedef struct tmln TMLN;
 typedef struct tmxr TMXR;
@@ -356,7 +356,7 @@ t_stat tmxr_add_debug (DEVICE *dptr);
 #define sim_activate_abs tmxr_activate_abs
 #define sim_activate_after tmxr_activate_after
 #define sim_activate_after_abs tmxr_activate_after_abs
-#define sim_clock_coschedule tmxr_clock_coschedule 
+#define sim_clock_coschedule tmxr_clock_coschedule
 #define sim_clock_coschedule_abs tmxr_clock_coschedule_abs
 #define sim_clock_coschedule_tmr tmxr_clock_coschedule_tmr
 #define sim_clock_coschedule_tmr_abs tmxr_clock_coschedule_tmr_abs
diff --git a/sim_video.c b/sim_video.c
index 05a8794..e1e0c13 100644
--- a/sim_video.c
+++ b/sim_video.c
@@ -104,20 +104,20 @@ char vid_release_key[64] = "Ctrl-Right-Shift";
 #include <SDL.h>
 #include <SDL_thread.h>
 
-static const char *key_names[] = 
-    {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", 
-     "0",   "1",  "2",  "3",  "4",  "5",  "6",  "7",  "8",  "9",    
-     "A",   "B",  "C",  "D",  "E",  "F",  "G",  "H",  "I",  "J", 
-     "K",   "L",  "M",  "N",  "O",  "P",  "Q",  "R",  "S",  "T", 
-     "U",   "V",  "W",  "X",  "Y",  "Z", 
-     "BACKQUOTE",   "MINUS",   "EQUALS", "LEFT_BRACKET", "RIGHT_BRACKET", 
-     "SEMICOLON", "SINGLE_QUOTE", "BACKSLASH", "LEFT_BACKSLASH", "COMMA", 
-     "PERIOD", "SLASH", "PRINT", "SCRL_LOCK", "PAUSE", "ESC", "BACKSPACE", 
-     "TAB", "ENTER", "SPACE", "INSERT", "DELETE", "HOME", "END", "PAGE_UP", 
-     "PAGE_DOWN", "UP", "DOWN", "LEFT", "RIGHT", "CAPS_LOCK", "NUM_LOCK", 
-     "ALT_L", "ALT_R", "CTRL_L", "CTRL_R", "SHIFT_L", "SHIFT_R", 
-     "WIN_L", "WIN_R", "MENU", "KP_ADD", "KP_SUBTRACT", "KP_END", "KP_DOWN", 
-     "KP_PAGE_DOWN", "KP_LEFT", "KP_RIGHT", "KP_HOME", "KP_UP", "KP_PAGE_UP", 
+static const char *key_names[] =
+    {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12",
+     "0",   "1",  "2",  "3",  "4",  "5",  "6",  "7",  "8",  "9",
+     "A",   "B",  "C",  "D",  "E",  "F",  "G",  "H",  "I",  "J",
+     "K",   "L",  "M",  "N",  "O",  "P",  "Q",  "R",  "S",  "T",
+     "U",   "V",  "W",  "X",  "Y",  "Z",
+     "BACKQUOTE",   "MINUS",   "EQUALS", "LEFT_BRACKET", "RIGHT_BRACKET",
+     "SEMICOLON", "SINGLE_QUOTE", "BACKSLASH", "LEFT_BACKSLASH", "COMMA",
+     "PERIOD", "SLASH", "PRINT", "SCRL_LOCK", "PAUSE", "ESC", "BACKSPACE",
+     "TAB", "ENTER", "SPACE", "INSERT", "DELETE", "HOME", "END", "PAGE_UP",
+     "PAGE_DOWN", "UP", "DOWN", "LEFT", "RIGHT", "CAPS_LOCK", "NUM_LOCK",
+     "ALT_L", "ALT_R", "CTRL_L", "CTRL_R", "SHIFT_L", "SHIFT_R",
+     "WIN_L", "WIN_R", "MENU", "KP_ADD", "KP_SUBTRACT", "KP_END", "KP_DOWN",
+     "KP_PAGE_DOWN", "KP_LEFT", "KP_RIGHT", "KP_HOME", "KP_UP", "KP_PAGE_UP",
      "KP_INSERT", "KP_DELETE", "KP_5", "KP_ENTER", "KP_MULTIPLY", "KP_DIVIDE"
      };
 
@@ -170,7 +170,7 @@ static char tmp_key_name[40];
 #define amask 0xFF000000
 #endif
 
-/* libpng callbacks */ 
+/* libpng callbacks */
 static void png_error_SDL(png_structp ctx, png_const_charp str)
 {
     SDL_SetError("libpng: %s\n", str);
@@ -181,12 +181,12 @@ static void png_write_SDL(png_structp png_ptr, png_bytep data, png_size_t length
     SDL_RWwrite(rw, data, sizeof(png_byte), length);
 }
 
-static SDL_Surface *SDL_PNGFormatAlpha(SDL_Surface *src) 
+static SDL_Surface *SDL_PNGFormatAlpha(SDL_Surface *src)
 {
     SDL_Surface *surf;
     SDL_Rect rect = { 0 };
 
-    /* NO-OP for images < 32bpp and 32bpp images that already have Alpha channel */ 
+    /* NO-OP for images < 32bpp and 32bpp images that already have Alpha channel */
     if (src->format->BitsPerPixel <= 24 || src->format->Amask) {
         src->refcount++;
         return src;
@@ -202,7 +202,7 @@ static SDL_Surface *SDL_PNGFormatAlpha(SDL_Surface *src)
     return surf;
 }
 
-static int SDL_SavePNG_RW(SDL_Surface *surface, SDL_RWops *dst, int freedst) 
+static int SDL_SavePNG_RW(SDL_Surface *surface, SDL_RWops *dst, int freedst)
 {
     png_structp png_ptr;
     png_infop info_ptr;
@@ -225,7 +225,7 @@ static int SDL_SavePNG_RW(SDL_Surface *surface, SDL_RWops *dst, int freedst)
         return (ERROR);
     }
     png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, png_error_SDL, NULL); /* err_ptr, err_fn, warn_fn */
-    if (!png_ptr) 
+    if (!png_ptr)
     {
         SDL_SetError("Unable to png_create_write_struct on %s\n", PNG_LIBPNG_VER_STRING);
         if (freedst) SDL_RWclose(dst);
@@ -300,19 +300,19 @@ static int SDL_SavePNG_RW(SDL_Surface *surface, SDL_RWops *dst, int freedst)
 }
 #endif /* defined(HAVE_LIBPNG) */
 
-/* 
-    Some platforms (OS X), require that ALL input event processing be 
+/*
+    Some platforms (OS X), require that ALL input event processing be
     performed by the main thread of the process.
 
-    To satisfy this requirement, we leverage the SDL_MAIN functionality 
+    To satisfy this requirement, we leverage the SDL_MAIN functionality
     which does:
-    
+
              #defines main SDL_main
-     
-     and we define the main() entry point here.  Locally, we run the 
+
+     and we define the main() entry point here.  Locally, we run the
      application's SDL_main in a separate thread, and while that thread
      is running, the main thread performs event handling and dispatch.
-     
+
  */
 
 #define EVENT_REDRAW      1                              /* redraw event for SDL */
@@ -327,6 +327,7 @@ static int SDL_SavePNG_RW(SDL_Surface *surface, SDL_RWops *dst, int freedst)
 #define EVENT_BEEP       10                              /* audio beep */
 #define EVENT_FULLSCREEN 11                              /* fullscreen */
 #define EVENT_SIZE       12                              /* set window size */
+#define EVENT_LOGICAL    13                              /* set window logical size */
 #define MAX_EVENTS       20                              /* max events in queue */
 
 typedef struct {
@@ -397,6 +398,7 @@ SDL_MouseButtonEvent *bev;
 SDL_MouseMotionEvent *mev;
 SDL_WindowEvent *wev;
 SDL_UserEvent *uev;
+SDL_version ver;
 
 if (windowID == lastID)
     return last_display;
@@ -474,9 +476,12 @@ switch (ev->type) {
         break;
     }
 
+SDL_GetVersion(&ver);
+
 sim_messagef (SCPE_OK,
 "\nSIMH has encountered a bug in SDL2.  An upgrade to SDL2\n"
-"version 2.0.14 should fix this problem.\n");
+"version 2.0.14 should fix this problem. You are running "
+"version %d.%d.%d.\n", ver.major, ver.minor, ver.patch);
 
 return NULL;
 }
@@ -636,12 +641,14 @@ int i, n;
 if (vid_gamepad_inited++)
     return;
 
-/* Chech that the SDL_GameControllerFromInstanceID function is
+/* Check that the SDL_GameControllerFromInstanceID function is
    available at run time. */
 SDL_GetVersion(&ver);
 vid_gamepad_ok = (ver.major > 2 ||
                   (ver.major == 2 && (ver.minor > 0 || ver.patch >= 4)));
 
+sim_debug (SIM_VID_DBG_VIDEO|SIM_VID_DBG_JOYSTICK, dev, "SDL %d.%d.%d %s support game controllers.\n", ver.major, ver.minor, ver.patch, vid_gamepad_ok ? "DOES" : "DOES NOT");
+
 if (vid_gamepad_ok)
     SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
 else
@@ -667,20 +674,22 @@ if (vid_gamepad_ok && SDL_GameControllerEventState (SDL_ENABLE) < 0) {
 
 n = SDL_NumJoysticks();
 
+sim_debug (SIM_VID_DBG_VIDEO|SIM_VID_DBG_JOYSTICK, dev, "Game controllers found: %d\n", n);
+
 for (i = 0; i < n; i++) {
     if (vid_gamepad_ok && SDL_IsGameController (i)) {
         SDL_GameController *x = SDL_GameControllerOpen (i);
         if (x != NULL) {
-            sim_debug (SIM_VID_DBG_VIDEO, dev,
+            sim_debug (SIM_VID_DBG_VIDEO|SIM_VID_DBG_JOYSTICK, dev,
             "Game controller: %s\n", SDL_GameControllerNameForIndex(i));
             }
         }
     else {
         y = SDL_JoystickOpen (i);
         if (y != NULL) {
-            sim_debug (SIM_VID_DBG_VIDEO, dev,
-            "Joystick: %s\n", SDL_JoystickNameForIndex(i));
-            sim_debug (SIM_VID_DBG_VIDEO, dev,
+            sim_debug (SIM_VID_DBG_VIDEO|SIM_VID_DBG_JOYSTICK, dev,
+            "%s\n", SDL_JoystickNameForIndex(i));
+            sim_debug (SIM_VID_DBG_VIDEO|SIM_VID_DBG_JOYSTICK, dev,
             "Number of axes: %d, buttons: %d\n",
             SDL_JoystickNumAxes(y),
             SDL_JoystickNumButtons(y));
@@ -990,7 +999,7 @@ if (vptr->vid_flags & SIM_VID_INPUTCAPTURED)
 
 if ((x_delta) || (y_delta)) {
     sim_debug (SIM_VID_DBG_CURSOR, vptr->vid_dev, "vid_set_cursor_position(%d, %d) - Cursor position changed\n", x, y);
-    /* Any queued mouse motion events need to have their relative 
+    /* Any queued mouse motion events need to have their relative
        positions adjusted since they were queued based on different info. */
     if (SDL_SemWait (vid_mouse_events.sem) == 0) {
         int32 i;
@@ -1443,9 +1452,9 @@ if (vptr->vid_mouse_captured) {
 
     if (!KeyStates)
         KeyStates = SDL_GetKeyboardState(&numkeys);
-    if ((vptr->vid_flags & SIM_VID_INPUTCAPTURED) && 
-        (event->state == SDL_PRESSED) && 
-        KeyStates[SDL_SCANCODE_RSHIFT] && 
+    if ((vptr->vid_flags & SIM_VID_INPUTCAPTURED) &&
+        (event->state == SDL_PRESSED) &&
+        KeyStates[SDL_SCANCODE_RSHIFT] &&
         (KeyStates[SDL_SCANCODE_LCTRL] || KeyStates[SDL_SCANCODE_RCTRL])) {
         sim_debug (SIM_VID_DBG_KEY, vptr->vid_dev, "vid_key() - Cursor Release\n");
         if (SDL_SetRelativeMouseMode(SDL_FALSE) < 0)    /* release cursor, show cursor */
@@ -1503,7 +1512,7 @@ if (!sim_is_running)
     return;
 if (!vptr->vid_cursor_visible)
     return;
-sim_debug (SIM_VID_DBG_MOUSE, vptr->vid_dev, "Mouse Move Event: pos:(%d,%d) rel:(%d,%d) buttons:(%d,%d,%d)\n", 
+sim_debug (SIM_VID_DBG_MOUSE, vptr->vid_dev, "Mouse Move Event: pos:(%d,%d) rel:(%d,%d) buttons:(%d,%d,%d)\n",
            event->x, event->y, event->xrel, event->yrel, (event->state & SDL_BUTTON(SDL_BUTTON_LEFT)) ? 1 : 0, (event->state & SDL_BUTTON(SDL_BUTTON_MIDDLE)) ? 1 : 0, (event->state & SDL_BUTTON(SDL_BUTTON_RIGHT)) ? 1 : 0);
 while (SDL_PeepEvents (&dummy_event, 1, SDL_GETEVENT, SDL_MOUSEMOTION, SDL_MOUSEMOTION)) {
     /* Coalesce motion activity to avoid thrashing */
@@ -1512,7 +1521,7 @@ while (SDL_PeepEvents (&dummy_event, 1, SDL_GETEVENT, SDL_MOUSEMOTION, SDL_MOUSE
     event->x = dev->x;
     event->y = dev->y;
     event->state = dev->state;
-    sim_debug (SIM_VID_DBG_MOUSE, vptr->vid_dev, "Mouse Move Event: Additional Event Coalesced:pos:(%d,%d) rel:(%d,%d) buttons:(%d,%d,%d)\n", 
+    sim_debug (SIM_VID_DBG_MOUSE, vptr->vid_dev, "Mouse Move Event: Additional Event Coalesced:pos:(%d,%d) rel:(%d,%d) buttons:(%d,%d,%d)\n",
         dev->x, dev->y, dev->xrel, dev->yrel, (dev->state & SDL_BUTTON(SDL_BUTTON_LEFT)) ? 1 : 0, (dev->state & SDL_BUTTON(SDL_BUTTON_MIDDLE)) ? 1 : 0, (dev->state & SDL_BUTTON(SDL_BUTTON_RIGHT)) ? 1 : 0);
     };
 if (SDL_SemWait (vid_mouse_events.sem) == 0) {
@@ -1523,7 +1532,7 @@ if (SDL_SemWait (vid_mouse_events.sem) == 0) {
     vid_mouse_b1 = (event->state & SDL_BUTTON(SDL_BUTTON_LEFT)) ? TRUE : FALSE;
     vid_mouse_b2 = (event->state & SDL_BUTTON(SDL_BUTTON_MIDDLE)) ? TRUE : FALSE;
     vid_mouse_b3 = (event->state & SDL_BUTTON(SDL_BUTTON_RIGHT)) ? TRUE : FALSE;
-    sim_debug (SIM_VID_DBG_MOUSE, vptr->vid_dev, "Mouse Move Event: pos:(%d,%d) rel:(%d,%d) buttons:(%d,%d,%d) - Count: %d vid_cursor:(%d,%d)\n", 
+    sim_debug (SIM_VID_DBG_MOUSE, vptr->vid_dev, "Mouse Move Event: pos:(%d,%d) rel:(%d,%d) buttons:(%d,%d,%d) - Count: %d vid_cursor:(%d,%d)\n",
                                             event->x, event->y, event->xrel, event->yrel, (event->state & SDL_BUTTON(SDL_BUTTON_LEFT)) ? 1 : 0, (event->state & SDL_BUTTON(SDL_BUTTON_MIDDLE)) ? 1 : 0, (event->state & SDL_BUTTON(SDL_BUTTON_RIGHT)) ? 1 : 0, vid_mouse_events.count, vid_cursor_x, vid_cursor_y);
     if (vid_mouse_events.count < MAX_EVENTS) {
         SIM_MOUSE_EVENT *tail = &vid_mouse_events.events[(vid_mouse_events.tail+MAX_EVENTS-1)%MAX_EVENTS];
@@ -1538,13 +1547,13 @@ if (SDL_SemWait (vid_mouse_events.sem) == 0) {
         ev.y_pos = event->y;
         if ((vid_mouse_events.count > 0) &&             /* Is there a tail event? */
             (ev.b1_state == tail->b1_state) &&          /* With the same button state? */
-            (ev.b2_state == tail->b2_state) && 
+            (ev.b2_state == tail->b2_state) &&
             (ev.b3_state == tail->b3_state)) {          /* Merge the motion */
             tail->x_rel += ev.x_rel;
             tail->y_rel += ev.y_rel;
             tail->x_pos = ev.x_pos;
             tail->y_pos = ev.y_pos;
-            sim_debug (SIM_VID_DBG_MOUSE, vptr->vid_dev, "Mouse Move Event: Coalesced into pending event: (%d,%d)\n", 
+            sim_debug (SIM_VID_DBG_MOUSE, vptr->vid_dev, "Mouse Move Event: Coalesced into pending event: (%d,%d)\n",
                 tail->x_rel, tail->y_rel);
             }
         else {                                          /* Add a new event */
@@ -1642,6 +1651,26 @@ while (SDL_PushEvent (&user_event) < 0)
 #endif
 }
 
+void vid_render_set_logical_size (VID_DISPLAY *vptr, int32 w, int32 h)
+{
+SDL_Event user_event;
+
+vptr->vid_rect.h = h;
+vptr->vid_rect.w = w;
+
+user_event.type = SDL_USEREVENT;
+user_event.user.windowID = vptr->vid_windowID;
+user_event.user.code = EVENT_LOGICAL;
+user_event.user.data1 = NULL;
+user_event.user.data2 = NULL;
+#if defined (SDL_MAIN_AVAILABLE)
+while (SDL_PushEvent (&user_event) < 0)
+    sim_os_ms_sleep (100);
+#else
+    SDL_RenderSetLogicalSize(vptr->vid_renderer, w, h);
+#endif
+}
+
 t_bool vid_is_fullscreen_window (VID_DISPLAY *vptr)
 {
 return SDL_GetWindowFlags (vptr->vid_window) & SDL_WINDOW_FULLSCREEN_DESKTOP;
@@ -1728,7 +1757,7 @@ void vid_update_cursor (VID_DISPLAY *vptr, SDL_Cursor *cursor, t_bool visible)
 {
 if (!cursor)
     return;
-sim_debug (SIM_VID_DBG_VIDEO, vptr->vid_dev, "Cursor Update Event: Previously %s, Now %s, New Cursor object at: %p, Old Cursor object at: %p\n", 
+sim_debug (SIM_VID_DBG_VIDEO, vptr->vid_dev, "Cursor Update Event: Previously %s, Now %s, New Cursor object at: %p, Old Cursor object at: %p\n",
                             SDL_ShowCursor(-1) ? "visible" : "invisible", visible ? "visible" : "invisible", cursor, vptr->vid_cursor);
 SDL_SetCursor (cursor);
 if ((vptr->vid_window == SDL_GetMouseFocus ()) && visible)
@@ -1765,7 +1794,7 @@ SDL_UnlockMutex (vptr->vid_draw_mutex);
 
 if (vptr->vid_blending) {
     SDL_UpdateTexture(vptr->vid_texture, vid_dst, buf, vid_dst->w*sizeof(*buf));
-    SDL_RenderCopy (vptr->vid_renderer, vptr->vid_texture, vid_dst, vid_dst); 
+    SDL_RenderCopy (vptr->vid_renderer, vptr->vid_texture, vid_dst, vid_dst);
     }
 else
     if (SDL_UpdateTexture(vptr->vid_texture, vid_dst, buf, vid_dst->w*sizeof(*buf)))
@@ -2085,6 +2114,9 @@ while (vid_active) {
                         case SDL_WINDOWEVENT_EXPOSED:
                             vid_update (vptr);
                             break;
+                        case SDL_WINDOWEVENT_SIZE_CHANGED:
+                            vid_update (vptr);
+                            break;
                         default:
                             sim_debug (SIM_VID_DBG_VIDEO, vptr->vid_dev, "Did not handle window event: %d - %s\n", event.window.event, windoweventtypes[event.window.event]);
                             break;
@@ -2104,8 +2136,9 @@ while (vid_active) {
                 /*                   it notice vid_active has changed */
                 /* EVENT_SCREENSHOT  to take a screenshot */
                 /* EVENT_BEEP        to emit a beep sound */
-                /* EVENT_SIZE        to change screen size */
                 /* EVENT_FULLSCREEN  to change fullscreen */
+                /* EVENT_SIZE        to change screen size */
+                /* EVENT_LOGICAL     to change screen size */
                 while (vid_active && event.user.code) {
                     /* Handle Beep first since it isn't a window oriented event */
                     if (event.user.code == EVENT_BEEP) {
@@ -2165,6 +2198,10 @@ while (vid_active) {
                         SDL_SetWindowSize (vptr->vid_window, vptr->vid_rect.w, vptr->vid_rect.h);
                         event.user.code = 0;    /* Mark as done */
                         }
+                    if (event.user.code == EVENT_LOGICAL) {
+                        SDL_RenderSetLogicalSize (vptr->vid_renderer, vptr->vid_rect.w, vptr->vid_rect.h);
+                        event.user.code = 0;    /* Mark as done */
+                        }
                     if (event.user.code == EVENT_FULLSCREEN) {
                         if (event.user.data1 != NULL)
                             SDL_SetWindowFullscreen (vptr->vid_window, SDL_WINDOW_FULLSCREEN_DESKTOP);
@@ -2245,10 +2282,10 @@ SDLVersion[sizeof (SDLVersion) - 1] = '\0';
 if ((compiled.major == running.major) &&
     (compiled.minor == running.minor) &&
     (compiled.patch == running.patch))
-    snprintf(SDLVersion, sizeof (SDLVersion) - 1, "SDL Version %d.%d.%d", 
+    snprintf(SDLVersion, sizeof (SDLVersion) - 1, "SDL Version %d.%d.%d",
                         compiled.major, compiled.minor, compiled.patch);
 else
-    snprintf(SDLVersion, sizeof (SDLVersion) - 1, "SDL Version (Compiled: %d.%d.%d, Runtime: %d.%d.%d)", 
+    snprintf(SDLVersion, sizeof (SDLVersion) - 1, "SDL Version (Compiled: %d.%d.%d, Runtime: %d.%d.%d)",
                         compiled.major, compiled.minor, compiled.patch,
                         running.major, running.minor, running.patch);
 #if defined (HAVE_LIBPNG)
@@ -2256,19 +2293,19 @@ if (1) {
     png_structp png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
 
     if (strcmp (PNG_LIBPNG_VER_STRING, png_get_libpng_ver (png)))
-        snprintf(&SDLVersion[strlen (SDLVersion)], sizeof (SDLVersion) - (strlen (SDLVersion) + 1), 
-                            ", PNG Version (Compiled: %s, Runtime: %s)", 
+        snprintf(&SDLVersion[strlen (SDLVersion)], sizeof (SDLVersion) - (strlen (SDLVersion) + 1),
+                            ", PNG Version (Compiled: %s, Runtime: %s)",
                             PNG_LIBPNG_VER_STRING, png_get_libpng_ver (png));
     else
-        snprintf(&SDLVersion[strlen (SDLVersion)], sizeof (SDLVersion) - (strlen (SDLVersion) + 1), 
+        snprintf(&SDLVersion[strlen (SDLVersion)], sizeof (SDLVersion) - (strlen (SDLVersion) + 1),
                             ", PNG Version %s", PNG_LIBPNG_VER_STRING);
     png_destroy_read_struct(&png, NULL, NULL);
 #if defined (ZLIB_VERSION)
     if (strcmp (ZLIB_VERSION, zlibVersion ()))
-        snprintf(&SDLVersion[strlen (SDLVersion)], sizeof (SDLVersion) - (strlen (SDLVersion) + 1), 
+        snprintf(&SDLVersion[strlen (SDLVersion)], sizeof (SDLVersion) - (strlen (SDLVersion) + 1),
                             ", zlib: (Compiled: %s, Runtime: %s)", ZLIB_VERSION, zlibVersion ());
     else
-        snprintf(&SDLVersion[strlen (SDLVersion)], sizeof (SDLVersion) - (strlen (SDLVersion) + 1), 
+        snprintf(&SDLVersion[strlen (SDLVersion)], sizeof (SDLVersion) - (strlen (SDLVersion) + 1),
                             ", zlib: %s", ZLIB_VERSION);
 #endif
     }
@@ -2617,7 +2654,7 @@ char *extension = strrchr ((char *)_screenshot_filename, '.');
 if (name == NULL) {
     _screenshot_stat = SCPE_NXM;
     return;
-    }   
+    }
 if (extension)
     n = extension - _screenshot_filename;
 else {
@@ -2741,7 +2778,7 @@ while (SDL_PushEvent (&user_event) < 0)
 #else
 vid_beep_event ();
 #endif
-SDL_Delay (vid_beep_duration + 100);/* Wait for sound to finnish */
+SDL_Delay (vid_beep_duration + 100);/* Wait for sound to finish */
 }
 
 #else /* !(defined(USE_SIM_VIDEO) && defined(HAVE_LIBSDL)) */
@@ -2895,6 +2932,11 @@ void vid_set_window_size (VID_DISPLAY *vptr, int32 w, int32 h)
 return;
 }
 
+void vid_render_set_logical_size (VID_DISPLAY *vptr, int32 w, int32 h)
+{
+return;
+}
+
 const char *vid_key_name (uint32 key)
 {
 return "";
diff --git a/sim_video.h b/sim_video.h
index c74eb3c..dea0507 100644
--- a/sim_video.h
+++ b/sim_video.h
@@ -217,6 +217,7 @@ t_stat vid_set_fullscreen (t_bool flag);
 extern int vid_active;
 void vid_set_cursor_position (int32 x, int32 y);        /* cursor position (set by calling code) */
 void vid_set_window_size (VID_DISPLAY *vptr, int32 x, int32 y);            /* window size (set by calling code) */
+void vid_render_set_logical_size (VID_DISPLAY *vptr, int32 w, int32 h);
 
 t_stat vid_open_window (VID_DISPLAY **vptr, DEVICE *dptr, const char *title, uint32 width, uint32 height, int flags);
 t_stat vid_close_window (VID_DISPLAY *vptr);
@@ -245,10 +246,11 @@ t_stat vid_set_alpha_mode (VID_DISPLAY *vptr, int mode);
  */
 extern int (*vid_display_kb_event_process)(SIM_KEY_EVENT *kev);
 
-#define SIM_VID_DBG_MOUSE   0x10000000
-#define SIM_VID_DBG_CURSOR  0x20000000
-#define SIM_VID_DBG_KEY     0x40000000
-#define SIM_VID_DBG_VIDEO   0x80000000
+#define SIM_VID_DBG_JOYSTICK 0x08000000
+#define SIM_VID_DBG_MOUSE    0x10000000
+#define SIM_VID_DBG_CURSOR   0x20000000
+#define SIM_VID_DBG_KEY      0x40000000
+#define SIM_VID_DBG_VIDEO    0x80000000
 
 #ifdef  __cplusplus
 }