diff --git a/mystic/bbs_io.pas b/mystic/bbs_io.pas
index 39177ac..7bed31b 100644
--- a/mystic/bbs_io.pas
+++ b/mystic/bbs_io.pas
@@ -1555,6 +1555,7 @@ Begin
     If (bbsCfg.Inactivity > 0) and (Session.User.ThisUser.Flags And UserNoTimeOut = 0) and (TimerSeconds - TBBSCore(Core).TimeOut >= bbsCfg.Inactivity) Then Begin
       TBBSCore(Core).SystemLog('Inactivity timeout');
       OutFullLn (TBBSCore(Core).GetPrompt(136));
+      BufFlush;
       Halt(0);
     End;
 
diff --git a/mystic/bbs_msgbase.pas b/mystic/bbs_msgbase.pas
index 23802b7..0fc9552 100644
--- a/mystic/bbs_msgbase.pas
+++ b/mystic/bbs_msgbase.pas
@@ -238,6 +238,7 @@ Begin
 
     While NodeList.FindNext(NodeData) Do Begin
       Case ListType of
+        0 : If Not FromMenu and (NodeData.Address.Net = 0) Then Continue;
         1 : If NodeData.Keyword <> 'ZONE' Then Continue;
         2 : If (NodeData.Keyword <> 'ZONE') and (NodeData.Keyword <> 'REGION') and (NodeData.Keyword <> 'HOST') Then Continue;
       End;
@@ -1113,6 +1114,8 @@ Begin
       Areas := 0;
       Session.User.ThisUser.LastMGroup := FilePos(GroupFile);
 
+      // use gettotalbases(true) here!?
+      
       If bbsCfg.MShowBases Then Begin
         Reset (MBaseFile);
         Read  (MBaseFile, tMBase); { Skip EMAIL base }
diff --git a/mystic/mis_client_telnet.pas b/mystic/mis_client_telnet.pas
index 51554c9..693064d 100644
--- a/mystic/mis_client_telnet.pas
+++ b/mystic/mis_client_telnet.pas
@@ -205,7 +205,7 @@ Begin
 
   ND.SetNodeInfo(Num, NI);
 
-  FileErase (bbsConfig.DataPath + 'chat' + strI2S(NI.Num) + '.dat');
+  FileErase (bbsCfg.DataPath + 'chat' + strI2S(NI.Num) + '.dat');
 End;
 {$ENDIF}
 
@@ -266,7 +266,7 @@ Begin
 
   ND.SetNodeInfo(Num, NI);
 
-  FileErase (bbsConfig.DataPath + 'chat' + strI2S(NI.Num) + '.dat');
+  FileErase (bbsCfg.DataPath + 'chat' + strI2S(NI.Num) + '.dat');
 End;
 {$ENDIF}
 
diff --git a/mystic/mutil_echoimport.pas b/mystic/mutil_echoimport.pas
index 1f0b725..1499d25 100644
--- a/mystic/mutil_echoimport.pas
+++ b/mystic/mutil_echoimport.pas
@@ -121,8 +121,8 @@ Var
         If Not ProcessedByAreaFix(PKT) Then
           If GetMBaseByNetZone (PKT.PKTHeader.DestZone, MBase) Then Begin
             For Count := 1 to ForwardSize Do
-              If strUpper(strWordGet(1, ForwardList[Count], ';')) = strUpper(PKT.MsgTo) Then
-                PKT.MsgTo := strWordGet(2, ForwardList[Count], ';');
+              If strUpper(strStripB(strWordGet(1, ForwardList[Count], ';'), ' ')) = strUpper(PKT.MsgTo) Then
+                PKT.MsgTo := strStripB(strWordGet(2, ForwardList[Count], ';'), ' ');
 
             CurTag := '';
 
@@ -244,7 +244,7 @@ Var
 
           Inc (TotalEcho);
 
-          Log (2, '+', '      Added Msg #' + strI2S(MsgBase^.GetHighMsgNum) + ' (' + MsgBase^.GetDate + ') to ' + strStripPipe(MBase.Name));
+          Log (2, '+', '      Added Msg #' + strI2S(MsgBase^.GetHighMsgNum) + ' to ' + strStripPipe(MBase.Name));
         End;
       End;
     End;
@@ -383,7 +383,7 @@ Begin
 
     Inc (ForwardSize);
 
-    ForwardList[ForwardSize] := FileExt;
+    ForwardList[ForwardSize] := strStripB(FileExt, ' ');
   Until ForwardSize = 50;
 
   INI.SetSequential(False);
diff --git a/mystic/todo.pas b/mystic/todo.pas
index fdbf1f8..c8a28f1 100644
--- a/mystic/todo.pas
+++ b/mystic/todo.pas
@@ -7,6 +7,7 @@ design elements/issues.
 
 BUGS AND POSSIBLE ISSUES
 ========================
+- fidonet NA export
 - shift+c key in OSX does not work without shiftlock (rudi)?
 - need to add QWK network ID to all message bases (remove QWK net flag?)
 - need to add QWK networking editor (type: hub, or node)
@@ -43,17 +44,19 @@ BUGS AND POSSIBLE ISSUES
 
 FUTURE / IDEAS / WORK IN PROGRESS / NOTES
 =========================================
+- matrix disconnect if they use the XL command too many times
+- index00.html or whatever in FTP server
+- buffer echomail export and use mailer LR pointers
+- add mystic's downlinks to areas.bbs export?
+- add exportto into mutil.ini for [ImportMessageBase] ??
 - auto create qwk network message bases?
+- qwk net msg dupe detection?
 - make -CFG mode NOT use inactivity timeout
 - ability when editing a posted message to be able to toggle the Private flag
   if the base is Pub/Priv
 - when editing an already posted message with reference linkage, export the
   quote data from the original message...
 - in file listing jump to files by typing the file number
-- remove console class code from mutil since its in bbs_database
-     ^ same with keyboard
-- think through the Local flag for all QWK networking situations
-  as well as semaphore file creation
 - add QWKNet base type or no?  leaning towards no because it might limit
   hybrid FIDO/QWK networks which maybe we can do currently?  need to think
   about the SENT flag and how we could determine which type it was circulated
diff --git a/mystic/whatsnew.txt b/mystic/whatsnew.txt
index e760c39..b6736df 100644
--- a/mystic/whatsnew.txt
+++ b/mystic/whatsnew.txt
@@ -3800,4 +3800,16 @@
  ! SEEN-BY and PATH kludge lines are no longer added to exported netmail
    messages.
 
+ + Mystic will now flush the buffer after displaying the Inactivity timeout
+   prompt so that your remote users will actually see it!
+
+ + When sending NETMAIL, Mystic's nodelist browser will now filter out any
+   nodes which are part of net "0" in the address searches.  Using the browser
+   menu command will still show them.  Assuming you have Forced NL compliance
+   turned on, this will prevent users from ever being able to select a net 0
+   address.
+
+ + Mystic's netmail fowarding will now strip leading and trailing spaces in
+   case of typos in the .INI.
+
    <ALPHA 38 RELEASED>