diff --git a/gopher.c b/gopher.c
index 0751dac..99c9c47 100644
--- a/gopher.c
+++ b/gopher.c
@@ -1,6 +1,6 @@
 #pragma optimize 79
+#pragma noroot
 
-#include <Locator.h>
 #include <Memory.h>
 #include <MiscTool.h>
 #include <tcpip.h>
@@ -16,6 +16,9 @@
 
 #include <unistd.h>
 
+#include "s16debug.h"
+
+
 extern int setfiletype(const char *filename);
 
 /*
@@ -26,78 +29,9 @@ extern int setfiletype(const char *filename);
  * bin  -- ends when connection is closed.
  */
 
-// startup/shutdown flags.
-enum {
-  kLoaded = 1,
-  kStarted = 2,
-  kConnected = 4
-};
-
-Word StartUp(displayPtr fx)
-{
-  word status;
-  word flags = 0;
-  
-  // TCPIP is an init, not a tool, so it should always
-  // be loaded.
-  
-  status = TCPIPStatus();
-  if (_toolErr)
-  {
-    LoadOneTool(54, 0x0300);
-    if (_toolErr) return -1;
-
-    status = 0;
-    flags |= kLoaded;
-  }
-
-#if 0
-  // require 3.0b3
-  if (TCPIPLongVersion() < 0x03006003)
-  {
-    if (flags & kLoaded)
-      UnloadOneTool(54);
-    return -1;      
-  }
-#endif
-
-  if (!status)
-  {
-    TCPIPStartUp();
-    if (_toolErr) return -1;
-    flags |= kStarted;
-  }
-
-  status = TCPIPGetConnectStatus();
-  if (!status)
-  {
-    TCPIPConnect(fx);
-    flags |= kConnected;
-  }
-
-  return flags;
-}
-
-void ShutDown(word flags, Boolean force, displayPtr fx)
-{
-    if (flags & kConnected)
-    {
-      TCPIPDisconnect(force, fx);
-      if (_toolErr) return;
-    }
-    if (flags & kStarted)
-    {
-      TCPIPShutDown();
-      if (_toolErr) return;
-    }
-    if (flags & kLoaded)
-    {
-      UnloadOneTool(54);
-    }
-}
 
 
-int gopher_binary(Word ipid, FILE *file)
+static int gopher_binary(Word ipid, FILE *file)
 {
   // gopher binary support.
   // format: raw data until eof.
@@ -125,7 +59,7 @@ int gopher_binary(Word ipid, FILE *file)
   return rv;
 }
 
-int gopher_text(Word ipid, FILE *file)
+static int gopher_text(Word ipid, FILE *file)
 {
   // text \r\n
   // ...
@@ -166,7 +100,7 @@ int gopher_text(Word ipid, FILE *file)
       {
         if (lastTerm == '\r' && rb.terminator == '\n')
         {
-            /* nothing */
+            lastTerm = TERMINATOR_CR_LF;
         }
         else 
             fputc('\r', file);
@@ -212,7 +146,7 @@ int gopher_text(Word ipid, FILE *file)
   return eof ? 0 : -1;
 }
 
-int gopher_dir(Word ipid, FILE *file)
+static int gopher_dir(Word ipid, FILE *file)
 {
   Word eof = 0;
   int rv = 0;
@@ -435,180 +369,7 @@ void do_gopher(const char *url, URLComponents *components, FILE *file)
   free (host);
 }
 
-void help(void)
-{
 
-  fputs("gopher [options] url\n", stdout);
-  fputs("-h         display help information.\n", stdout);
-  fputs("-v         display version information.\n", stdout);
-  fputs("-O         write output to file.\n", stdout);
-  fputs("-o <file>  write output to <file> instead of stdout.\n", stdout);
-  fputs("\n", stdout);
-  
-  exit(0);
-}
 
-/*
- *
- *
- */
 
-char *get_url_filename(const char *cp, URLComponents *components)
-{
-    URLRange path;
-    int slash;
-    int i, j;
-    char *out;
-    
-    path = components->path;
-    
-    if (path.length <= 0) return NULL;
-    
-    cp += path.location;
-    
-    // scan the path, for the last '/'
-    slash = -1;
-    for (i = 0; i < path.length; ++i)
-    {
-      if (cp[i] == '/') slash = i;
-    }
-    
-    if (slash == -1 || slash + 1 >= path.length) return NULL;
-    
-    
-    out = (char *)malloc(path.length - slash);
-    if (!out) return NULL;
-    
-    j = 0;
-    i = slash + 1; // skip the slash.
-    while (i < path.length)
-      out[j++] = cp[i++];
-    
-    out[j] = 0; // null terminate.
-    
-    return out;
-}
-
-int main(int argc, char **argv)
-{
-  int i;
-  Word flags;
-  int ch;
-  char *filename = NULL;
-  int flagO = 0;
-  
-  flags = StartUp(NULL);
-
-  while ((ch = getopt(argc, argv, "o:Oh")) != -1)
-  {
-    switch (ch)
-    {
-    case 'v':
-        fputs("gopher v 0.1\n", stdout);
-        exit(0);
-        break;
-        
-    case 'o':
-        filename = optarg;
-        break;
-    
-    case 'O':
-        flagO = 1;
-        break;
-    
-    case 'h':
-    case '?':
-    case ':':
-    default:
-        help();
-        break;
-    }
-  
-  }
-  
-  argc -= optind;
-  argv += optind;
-
-  if (argc != 1)
-  {
-    help();
-  }
-
-  if (argc == 1)
-  {
-    const char *url;
-    URLComponents components;
-
-    url = *argv;
-    
-    if (!ParseURL(url, strlen(url), &components))
-    {
-      fprintf(stderr, "Invalid URL: %s\n", url);
-      exit(1);
-    }
-   
-    if (!components.host.length)
-    {
-      fprintf(stderr, "No host.\n");
-      exit(1);
-    }
-    
-    if (components.schemeType == SCHEME_GOPHER)
-    {
-        FILE *file = NULL;
-        
-        if (!components.portNumber) components.portNumber = 70;
-        
-        if (filename)
-        {
-            file = fopen(filename, "w");
-            if (!file)
-            {
-                fprintf(stderr, "Unable to open file ``%s'': %s", 
-                  filename, strerror(errno));
-                exit(1);
-            }
-            setfiletype(filename);
-        }
-        else if (flagO)
-        {
-            // get the file name from the URL.
-            
-            filename = get_url_filename(url, &components);
-            if (!filename)
-            {
-                fprintf(stderr, "-O flag cannot be used with this URL.\n");
-                exit(1);
-            }
-            
-            file = fopen(filename, "w");
-            if (!file)
-            {
-                fprintf(stderr, "Unable to open file ``%s'': %s", 
-                  filename, strerror(errno));
-                exit(1);            
-            }
-            
-            setfiletype(filename);
-            
-            free(filename);
-            filename = NULL;
-        }
-        else file = stdout;
-        
-        do_gopher(url, &components, file);
-        
-        if (file != stdout) fclose(file);
-    }
-    else
-    {
-        fprintf(stderr, "Unsupported scheme.\n");
-        exit(1);
-    }
-  }
-
-  ShutDown(flags, false, NULL);
-
-  return 0;
-}
 
diff --git a/main.c b/main.c
new file mode 100644
index 0000000..5f33b64
--- /dev/null
+++ b/main.c
@@ -0,0 +1,269 @@
+#pragma optimize 79
+
+#include <Locator.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "url.h"
+#include "connection.h"
+
+
+extern int setfiletype(const char *filename);
+extern void do_gopher(const char *url, URLComponents *components, FILE *file);
+
+
+// startup/shutdown flags.
+enum {
+  kLoaded = 1,
+  kStarted = 2,
+  kConnected = 4
+};
+
+Word StartUp(displayPtr fx)
+{
+  word status;
+  word flags = 0;
+  
+  // TCPIP is an init, not a tool, so it should always
+  // be loaded.
+  
+  status = TCPIPStatus();
+  if (_toolErr)
+  {
+    LoadOneTool(54, 0x0300);
+    if (_toolErr) return -1;
+
+    status = 0;
+    flags |= kLoaded;
+  }
+
+
+  // require 3.0b3
+  if (TCPIPLongVersion() < 0x03006003)
+  {
+    if (flags & kLoaded)
+      UnloadOneTool(54);
+    return -1;      
+  }
+
+
+  if (!status)
+  {
+    TCPIPStartUp();
+    if (_toolErr) return -1;
+    flags |= kStarted;
+  }
+
+  status = TCPIPGetConnectStatus();
+  if (!status)
+  {
+    TCPIPConnect(fx);
+    flags |= kConnected;
+  }
+
+  return flags;
+}
+
+void ShutDown(word flags, Boolean force, displayPtr fx)
+{
+    if (flags & kConnected)
+    {
+      TCPIPDisconnect(force, fx);
+      if (_toolErr) return;
+    }
+    if (flags & kStarted)
+    {
+      TCPIPShutDown();
+      if (_toolErr) return;
+    }
+    if (flags & kLoaded)
+    {
+      UnloadOneTool(54);
+    }
+}
+
+
+void help(void)
+{
+
+  fputs("gopher [options] url\n", stdout);
+  fputs("-h         display help information.\n", stdout);
+  fputs("-v         display version information.\n", stdout);
+  fputs("-O         write output to file.\n", stdout);
+  fputs("-o <file>  write output to <file> instead of stdout.\n", stdout);
+  fputs("\n", stdout);
+  
+  exit(0);
+}
+
+/*
+ *
+ *
+ */
+
+char *get_url_filename(const char *cp, URLComponents *components)
+{
+    URLRange path;
+    int slash;
+    int i, j;
+    char *out;
+    
+    path = components->path;
+    
+    if (path.length <= 0) return NULL;
+    
+    cp += path.location;
+    
+    // scan the path, for the last '/'
+    slash = -1;
+    for (i = 0; i < path.length; ++i)
+    {
+      if (cp[i] == '/') slash = i;
+    }
+    
+    if (slash == -1 || slash + 1 >= path.length) return NULL;
+    
+    
+    out = (char *)malloc(path.length - slash);
+    if (!out) return NULL;
+    
+    j = 0;
+    i = slash + 1; // skip the slash.
+    while (i < path.length)
+      out[j++] = cp[i++];
+    
+    out[j] = 0; // null terminate.
+    
+    return out;
+}
+
+
+int main(int argc, char **argv)
+{
+  int i;
+  Word flags;
+  int ch;
+  char *filename = NULL;
+  int flagO = 0;
+  
+  flags = StartUp(NULL);
+
+  if (flags == -1)
+  {
+    fprintf(stderr, "Marinetti 3.0b3 or higher is required.\n");
+    exit(1);
+  }
+  
+  while ((ch = getopt(argc, argv, "o:Oh")) != -1)
+  {
+    switch (ch)
+    {
+    case 'v':
+        fputs("gopher v 0.1\n", stdout);
+        exit(0);
+        break;
+        
+    case 'o':
+        filename = optarg;
+        break;
+    
+    case 'O':
+        flagO = 1;
+        break;
+    
+    case 'h':
+    case '?':
+    case ':':
+    default:
+        help();
+        break;
+    }
+  
+  }
+  
+  argc -= optind;
+  argv += optind;
+
+  if (argc != 1)
+  {
+    help();
+  }
+
+  if (argc == 1)
+  {
+    const char *url;
+    URLComponents components;
+
+    url = *argv;
+    
+    if (!ParseURL(url, strlen(url), &components))
+    {
+      fprintf(stderr, "Invalid URL: %s\n", url);
+      exit(1);
+    }
+   
+    if (!components.host.length)
+    {
+      fprintf(stderr, "No host.\n");
+      exit(1);
+    }
+    
+    if (components.schemeType == SCHEME_GOPHER)
+    {
+        FILE *file = NULL;
+                
+        if (filename)
+        {
+            file = fopen(filename, "w");
+            if (!file)
+            {
+                fprintf(stderr, "Unable to open file ``%s'': %s", 
+                  filename, strerror(errno));
+                exit(1);
+            }
+            setfiletype(filename);
+        }
+        else if (flagO)
+        {
+            // get the file name from the URL.
+            
+            filename = get_url_filename(url, &components);
+            if (!filename)
+            {
+                fprintf(stderr, "-O flag cannot be used with this URL.\n");
+                exit(1);
+            }
+            
+            file = fopen(filename, "w");
+            if (!file)
+            {
+                fprintf(stderr, "Unable to open file ``%s'': %s", 
+                  filename, strerror(errno));
+                exit(1);            
+            }
+            
+            setfiletype(filename);
+            
+            free(filename);
+            filename = NULL;
+        }
+        else file = stdout;
+        
+        do_gopher(url, &components, file);
+        
+        if (file != stdout) fclose(file);
+    }
+    else
+    {
+        fprintf(stderr, "Unsupported scheme.\n");
+        exit(1);
+    }
+  }
+
+  ShutDown(flags, false, NULL);
+
+  return 0;
+}