diff --git a/mystic/bbs_core.pas b/mystic/bbs_core.pas
index 742985b..3efb062 100644
--- a/mystic/bbs_core.pas
+++ b/mystic/bbs_core.pas
@@ -11,7 +11,7 @@ Uses
   {$ENDIF}
   m_FileIO,
   m_Strings,
-  m_Pipe_Disk,
+  m_Pipe,
   m_DateTime,
   BBS_Common,
   BBS_IO,
@@ -34,7 +34,7 @@ Type
     FileBase      : TFileBase;
     Menu          : TMenuEngine;
     IO            : TBBSIO;
-    Pipe          : TPipeDisk;
+    Pipe          : TPipe;
     EventFile     : File of EventRec;
     ThemeFile     : File of RecTheme;
     VoteFile      : File of VoteRec;
@@ -331,6 +331,8 @@ Begin
   If TimerStart > TimerMinutes Then Begin
     Dec (TimerStart, 1440);
     Dec (TimerEnd,   1440);
+
+    SetTimeLeft (User.Security.Time);
   End;
 
   ElapsedTime := TimerMinutes - TimerStart;
diff --git a/mystic/bbs_msgbase.pas b/mystic/bbs_msgbase.pas
index f460bd2..7b96055 100644
--- a/mystic/bbs_msgbase.pas
+++ b/mystic/bbs_msgbase.pas
@@ -990,11 +990,11 @@ Begin
             MsgNew^.SetOrig (Addr);
           End;
     Else
-      MsgNew^.SetTo(ToWho);
+      MsgNew^.SetTo (ToWho);
     End;
 
-    MsgNew^.SetSubj(Subj);
-    MsgNew^.SetRefer(MsgBase^.GetMsgNum);
+    MsgNew^.SetSubj (Subj);
+    MsgNew^.SetRefer (MsgBase^.GetMsgNum);
 
     AppendMessageText (MsgNew, Lines, ReplyID);
 
diff --git a/mystic/mis_common.pas b/mystic/mis_common.pas
index 2fee9ce..5e44837 100644
--- a/mystic/mis_common.pas
+++ b/mystic/mis_common.pas
@@ -240,5 +240,4 @@ Begin
   Result := True;
 End;
 
-
 End.
diff --git a/mystic/mutil_upload.pas b/mystic/mutil_upload.pas
index 5bf7553..689c24d 100644
--- a/mystic/mutil_upload.pas
+++ b/mystic/mutil_upload.pas
@@ -176,4 +176,4 @@ Begin
   ProcessResult (rDONE, True);
 End;
 
-End.
+End.
\ No newline at end of file
diff --git a/mystic/mystic.pas b/mystic/mystic.pas
index de260a2..88dcdaf 100644
--- a/mystic/mystic.pas
+++ b/mystic/mystic.pas
@@ -40,7 +40,7 @@ Uses
   m_DateTime,
   m_Output,
   m_Input,
-  m_Pipe_Disk,
+  m_Pipe,
   bbs_Common,
   bbs_Core,
   bbs_NodeInfo,
@@ -231,7 +231,7 @@ Begin
 
   FileMode         := 66;
   Session.TempPath := Config.SystemPath + 'temp' + strI2S(Session.NodeNum) + PathChar;
-  Session.Pipe     := TPipeDisk.Create(Config.DataPath, False, Session.NodeNum);
+  Session.Pipe     := TPipe.Create(Config.DataPath, False, Session.NodeNum);
 
   {$I-}
   MkDir (Config.SystemPath + 'temp' + strI2S(Session.NodeNum));
diff --git a/mystic/nodespy.pas b/mystic/nodespy.pas
index 9b54efb..6613875 100644
--- a/mystic/nodespy.pas
+++ b/mystic/nodespy.pas
@@ -37,7 +37,7 @@ Uses
   m_FileIO,
   m_DateTime,
   m_Strings,
-  m_Pipe_Disk,
+  m_Pipe,
   m_Input,
   m_Output,
   m_io_Base,
@@ -494,7 +494,7 @@ End;
 
 Procedure SnoopNode (Node: Byte);
 Var
-  Pipe    : TPipeDisk;
+  Pipe    : TPipe;
   Buffer  : Array[1..4 * 1024] of Char;
   BufRead : LongInt;
   Update  : LongInt;
@@ -532,7 +532,7 @@ Begin
 
   SendNodeMessage(Node, 11);
 
-  Pipe := TPipeDisk.Create(Config.DataPath, True, Node);
+  Pipe := TPipe.Create(Config.DataPath, True, Node);
 
   If Not Pipe.ConnectPipe(1500) Then Begin
     ShowMsgBox (0, 'Unable to establish a session.  Try again');