diff --git a/AOprivateServer.pbp b/AOprivateServer.pbp
index fddf6ca..eb4c813 100644
--- a/AOprivateServer.pbp
+++ b/AOprivateServer.pbp
@@ -7,7 +7,7 @@
   <section name="data">
     <explorer view="" pattern="8"/>
     <log show="1"/>
-    <lastopen date="2016-08-07 01:24" user="Sven" host="SPC"/>
+    <lastopen date="2016-09-08 17:34" user="Sven" host="SPC"/>
   </section>
   <section name="files">
     <file name="Common.pb">
@@ -16,19 +16,19 @@
     </file>
     <file name="gui.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="74a8671f0ce8a6737d96b6a1da532ea7"/>
+      <fingerprint md5="25ec1a31f56333066c3a2f6efda1a027"/>
     </file>
     <file name="main.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="eb49ed39dba285f8da8295340e962da2"/>
+      <fingerprint md5="c511df03dc522145f3cd251ae297144b"/>
     </file>
     <file name="server_shared.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="257d91b5d8ebd89e2ee7795533ae0dea"/>
+      <fingerprint md5="b681484961f858fa550ad315c5471e57"/>
     </file>
     <file name="shared_headers.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="dd58c4b58f7a8919d2bdfc7e94e3a998"/>
+      <fingerprint md5="eb1b0626c585fce079b8d8baa10e7e06"/>
     </file>
   </section>
   <section name="targets">
@@ -41,8 +41,8 @@
       <icon enable="1">sD.ico</icon>
       <format exe="default" cpu="2"/>
       <debugger custom="1" type="ide"/>
-      <compilecount enable="1" value="1218"/>
-      <buildcount enable="1" value="135"/>
+      <compilecount enable="1" value="1220"/>
+      <buildcount enable="1" value="136"/>
       <versioninfo enable="1">
         <field0 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>
         <field1 value="2.%COMPILECOUNT.%BUILDCOUNT,0"/>
@@ -65,6 +65,7 @@
         <constant value="#CONSOLE = 0" enable="1"/>
         <constant value="#ServerSideMasking = 0" enable="1"/>
         <constant value="#WEB=1" enable="1"/>
+        <constant value="#NICE=0" enable="1"/>
       </constants>
     </target>
     <target name="serverDco" enabled="1" default="0">
@@ -75,8 +76,8 @@
       <icon enable="0">owner.ico</icon>
       <format exe="console" cpu="0"/>
       <debugger custom="1" type="ide"/>
-      <compilecount enable="1" value="1201"/>
-      <buildcount enable="1" value="135"/>
+      <compilecount enable="1" value="1202"/>
+      <buildcount enable="1" value="136"/>
       <versioninfo enable="1">
         <field0 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>
         <field1 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>
@@ -100,6 +101,7 @@
         <constant value="#CONSOLE = 1" enable="1"/>
         <constant value="#ServerSideMasking = 0" enable="1"/>
         <constant value="#WEB=0" enable="1"/>
+        <constant value="#NICE=0" enable="1"/>
       </constants>
     </target>
   </section>
diff --git a/main.pb b/main.pb
index 11cf45d..965ce6f 100644
--- a/main.pb
+++ b/main.pb
@@ -353,7 +353,7 @@ Procedure LoadSettings(reload)
   ClosePreferences()
   
   ready$="CI#"
-  newcready$="CHARS#"
+  newcready$="SC#"
   charpage=0
   Debug CharacterNumber
   For loadcharsettings=0 To CharacterNumber
@@ -394,6 +394,7 @@ Procedure LoadSettings(reload)
     ltracks=0
     musicpage=0
     ready$="EM#"
+    newmready$="SM#"
     While Eof(2) = 0
       AddElement(Music())
       trackn$=ReadString(2) 
@@ -404,6 +405,7 @@ Procedure LoadSettings(reload)
       Music()\TrackName = track$
       Music()\Length = dur*1000
       ready$ = ready$ + Str(tracks) + "#" + track$ + "#"
+      newmready$=newmready$+track$+"#"
       ltracks+1
       tracks+1
       If ltracks = 10
@@ -417,6 +419,7 @@ Procedure LoadSettings(reload)
     If Not ltracks = 10
       ReadyMusic(musicpage)=ready$+"#%"
     EndIf
+    newmready$+"%"
     ReDim ReadyMusic(musicpage) 
     CloseFile(2)
     
@@ -425,6 +428,7 @@ Procedure LoadSettings(reload)
     AddElement(Music())
     Music()\TrackName="NO MUSIC LIST"
     ReadyMusic(0)="EM#0#NO MUSIC LIST##%"
+    newmready$="SM#NO MUSIC LIST#%"
     musicpage=0
     tracks=1
   EndIf
@@ -466,6 +470,7 @@ Procedure LoadSettings(reload)
   If OpenPreferences( "base/scene/"+scene$+"/areas.ini")
     PreferenceGroup("Areas")
     AreaNumber=ReadPreferenceInteger("number",1)
+    newaready$="SB#"
     For loadareas=0 To AreaNumber-1
       PreferenceGroup("Areas")
       aname$=Encode(ReadPreferenceString(Str(loadareas+1),oBG.s))
@@ -477,7 +482,16 @@ Procedure LoadSettings(reload)
       areas(loadareas)\hidden=ReadPreferenceInteger(Str(loadareas+1),0)
       PreferenceGroup("pass")
       areas(loadareas)\pw=Encode(ReadPreferenceString(Str(loadareas+1),""))
-    Next  
+      If areas(loadareas)\pw=""
+        passworded$="0"
+      Else
+        passworded$="1"
+      EndIf
+      If areas(loadareas)\hidden=0
+        newaready$+area$+"#"+aname$+"#"+passworded$+"#"
+      EndIf
+    Next
+    newaready$+"%"
     ClosePreferences()
   Else
     If CreatePreferences("base/scene/"+scene$+"/areas.ini")
@@ -579,27 +593,6 @@ Procedure LoadSettings(reload)
   
 EndProcedure
 
-Procedure TrackWait(a)
-  Define stoploop,k,cw
-  cw=1000
-  Repeat
-    For k=0 To AreaNumber-1
-      If Areas(k)\trackwait>1
-        If (Areas(k)\trackstart+Areas(k)\trackwait)<ElapsedMilliseconds()
-          Areas(k)\trackstart=ElapsedMilliseconds()
-          Debug "changed"
-          SendTarget("Area"+Str(k),"MC#"+Areas(k)\track+"#"+Str(characternumber)+"#%",Server)
-        Else
-          If Areas(k)\trackwait<cw
-            cw=(Areas(k)\trackstart+Areas(k)\trackwait)-ElapsedMilliseconds()
-          EndIf
-        EndIf
-      EndIf
-    Next
-    Delay(cw)
-  Until LoopMusic=0
-EndProcedure
-
 Procedure ListIP(ClientID)
   Define iplist$
   Define charname$
@@ -1881,8 +1874,12 @@ Procedure HandleAOCommand(ClientID)
       Case "askchar2" ; character list
         SendTarget(Str(ClientID),ReadyChar(0),Server)
         
-      Case "askchar3"
+      Case "RC"
         SendTarget(Str(ClientID),newcready$,Server)
+      Case "RM"
+        SendTarget(Str(ClientID),newmready$,Server)
+      Case "RB"
+        SendTarget(Str(ClientID),newaready$,Server)
         
       Case "CC"
         akchar=0
@@ -2357,9 +2354,9 @@ CompilerElse
 CompilerEndIf
 
 End
-; IDE Options = PureBasic 5.11 (Linux - x64)
-; CursorPosition = 378
-; FirstLine = 369
+; IDE Options = PureBasic 5.31 (Windows - x86)
+; CursorPosition = 2355
+; FirstLine = 2329
 ; Folding = ---
 ; EnableXP
 ; EnableCompileCount = 0
diff --git a/serverD.exe b/serverD.exe
index 2cf38b9..d8f7441 100644
Binary files a/serverD.exe and b/serverD.exe differ
diff --git a/serverDco.exe b/serverDco.exe
index 4b11905..868a385 100644
Binary files a/serverDco.exe and b/serverDco.exe differ
diff --git a/server_shared.pb b/server_shared.pb
index 0c3d3ef..0a4bd15 100644
--- a/server_shared.pb
+++ b/server_shared.pb
@@ -5,7 +5,7 @@ CompilerElse
   Global libext$=".dll"
 CompilerEndIf
 
-XIncludeFile "../serverD/shared_headers.pb"
+XIncludeFile "../server_private/shared_headers.pb"
 
 Global NewList Plugins.Plugin()
 
@@ -118,11 +118,11 @@ Procedure WriteLog(string$,*lclient.Client)
   Define mstr$,logstr$
   ; [23:21:05] David Skoland: (If mod)[M][IP][Timestamp, YYYYMMDDHHMM][Character][Message]
   Select *lclient\perm
-    Case 1
+    Case #MOD
       mstr$="[M]"
-    Case 2
+    Case #ADMIN
       mstr$="[A]"
-    Case 3
+    Case #SERVER
       mstr$="[S]"
     Default
       mstr$="[U]"
@@ -146,11 +146,11 @@ Procedure WriteLog(string$,*lclient.Client)
   CompilerEndIf   
 EndProcedure
 
-Procedure MSWait(*usagePointer.Client,message$)
+Procedure MSWait(*usagePointer.Client)
   Define wttime
   Debug areas(*usagePointer\area)\wait
   Debug *usagePointer\area
-  wttime=Len(Trim(message$))*60
+  wttime=Len(Trim(*usagePointer.Client\last))*6
   If wttime>5000
     wttime=5000
   EndIf
@@ -473,8 +473,30 @@ Procedure SendTarget(user$,message$,*sender.Client)
   EndIf
   UnlockMutex(ListMutex)
 EndProcedure
-; IDE Options = PureBasic 5.11 (Linux - x64)
-; CursorPosition = 410
-; FirstLine = 395
+
+Procedure TrackWait(a)
+  Define stoploop,k,cw
+  cw=1000
+  Debug "looping enabled"
+  Repeat
+    For k=0 To AreaNumber
+      If Areas(k)\trackwait>1
+        If (Areas(k)\trackstart+Areas(k)\trackwait)<ElapsedMilliseconds()
+          Areas(k)\trackstart=ElapsedMilliseconds()
+          Debug "changed"
+          SendTarget("Area"+Str(k),"MC#"+Areas(k)\track+"#"+Str(characternumber)+"#%",Server)
+        Else
+          If Areas(k)\trackwait<cw
+            cw=(Areas(k)\trackstart+Areas(k)\trackwait)-ElapsedMilliseconds()
+          EndIf
+        EndIf
+      EndIf
+    Next
+    Delay(cw)
+  Until LoopMusic=0
+EndProcedure
+; IDE Options = PureBasic 5.31 (Windows - x86)
+; CursorPosition = 479
+; FirstLine = 447
 ; Folding = ---
 ; EnableXP
\ No newline at end of file
diff --git a/shared_headers.pb b/shared_headers.pb
index 412c071..2db4bb5 100644
--- a/shared_headers.pb
+++ b/shared_headers.pb
@@ -64,7 +64,8 @@ Structure area
   good.w
   evil.w
   maxhp.w
-  replaymode.w
+  replaytime.w
+  replayfile.s
   track.s
   trackstart.l
   trackwait.i
@@ -135,7 +136,7 @@ Enumeration
   #SWITCH
   #MOVE
 EndEnumeration
-; IDE Options = PureBasic 5.11 (Linux - x64)
-; CursorPosition = 24
-; FirstLine = 4
+; IDE Options = PureBasic 5.31 (Windows - x86)
+; CursorPosition = 67
+; FirstLine = 27
 ; EnableXP
\ No newline at end of file