diff --git a/AOprivateServer.pbp b/AOprivateServer.pbp
index 0b21686..f3d208a 100644
--- a/AOprivateServer.pbp
+++ b/AOprivateServer.pbp
@@ -7,7 +7,7 @@
   <section name="data">
     <explorer view="" pattern="8"/>
     <log show="1"/>
-    <lastopen date="2016-09-28 13:57" user="Sven" host="SPC"/>
+    <lastopen date="2016-10-04 19:42" user="Sven" host="SPC"/>
   </section>
   <section name="files">
     <file name="Common.pb">
@@ -20,7 +20,7 @@
     </file>
     <file name="main.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="4bf57431008883109ff2e45f57d0c7c3"/>
+      <fingerprint md5="7839532054d1fff17269e43abeee2e3b"/>
     </file>
     <file name="server_shared.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
@@ -41,8 +41,8 @@
       <icon enable="1">sD.ico</icon>
       <format exe="default" cpu="2"/>
       <debugger custom="1" type="ide"/>
-      <compilecount enable="1" value="1286"/>
-      <buildcount enable="1" value="143"/>
+      <compilecount enable="1" value="1293"/>
+      <buildcount enable="1" value="145"/>
       <versioninfo enable="1">
         <field0 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>
         <field1 value="2.%COMPILECOUNT.%BUILDCOUNT,0"/>
@@ -76,8 +76,8 @@
       <icon enable="0">owner.ico</icon>
       <format exe="console" cpu="0"/>
       <debugger custom="1" type="ide"/>
-      <compilecount enable="1" value="1286"/>
-      <buildcount enable="1" value="143"/>
+      <compilecount enable="1" value="1293"/>
+      <buildcount enable="1" value="145"/>
       <versioninfo enable="1">
         <field0 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>
         <field1 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>
@@ -100,7 +100,7 @@
         <constant value="#NOPERM = 0" enable="1"/>
         <constant value="#CONSOLE = 1" enable="1"/>
         <constant value="#ServerSideMasking = 0" enable="1"/>
-        <constant value="#WEB=0" enable="1"/>
+        <constant value="#WEB=1" enable="1"/>
         <constant value="#NICE=0" enable="1"/>
       </constants>
     </target>
diff --git a/base/musiclist.txt b/base/musiclist.txt
index 6ac9925..ff250fa 100644
--- a/base/musiclist.txt
+++ b/base/musiclist.txt
@@ -68,4 +68,6 @@ Ghost Trick - Countdown.mp3*464
 Ghost Trick - The World of the Dead.mp3*686
 --- MLP ---
 OBJECTION(trixie).mp3*148
-Super Trixie.mp3*148
\ No newline at end of file
+Super Trixie.mp3*148
+--- DANK MEMES ---
+Darude - Sandstorm.mp3*233
\ No newline at end of file
diff --git a/main.pb b/main.pb
index 4ee0070..35d8aa9 100644
--- a/main.pb
+++ b/main.pb
@@ -33,7 +33,7 @@ Global MultiChar=1
 Global nthread=0
 Global error=0
 Global lasterror=0
-Global WebSockets=0
+Global WebSockets=1
 Global Logging.b=0
 Global LagShield=10
 Global public.b=0
@@ -266,7 +266,7 @@ Procedure LoadSettings(reload)
       WritePreferenceInteger("MultiChar",1)
       WritePreferenceInteger("WTCE",1)
       WritePreferenceInteger("ExpertLog",0)
-      WritePreferenceInteger("WebSockets",0)
+      WritePreferenceInteger("WebSockets",1)
       WritePreferenceString("LoginReply","CT#sD#got it#%")
       WritePreferenceString("LogFile","base/serverlog.log")
     EndIf
@@ -283,7 +283,7 @@ Procedure LoadSettings(reload)
   MultiChar=ReadPreferenceInteger("MultiChar",1)
   rt=ReadPreferenceInteger("WTCE",1)
   ExpertLog=ReadPreferenceInteger("ExpertLog",0)
-  WebSockets=ReadPreferenceInteger("WebSockets",0)
+  WebSockets=ReadPreferenceInteger("WebSockets",1)
   LoginReply$=ReadPreferenceString("LoginReply","CT#$HOST#Successfully connected as mod#%")
   LogFile$=ReadPreferenceString("LogFile","base/serverlog.log")
   decryptor$=ReadPreferenceString("decryptor","34")
@@ -638,6 +638,32 @@ Procedure ListIP(ClientID)
   SendTarget(Str(ClientID),iplist$,Server) 
 EndProcedure
 
+Procedure ListIPSI(ClientID)
+  Define iplist$
+  Define charname$
+  iplist$="SI#"
+  LockMutex(ListMutex)
+  PushMapPosition(Clients())
+  ResetMap(Clients())
+  While NextMapElement(Clients())
+    Select Clients()\perm
+      Case 1
+        charname$=GetCharacterName(Clients())+"(mod)"+" in "+GetAreaName(Clients())
+      Case 2
+        charname$=GetCharacterName(Clients())+"(admin)"+" in "+GetAreaName(Clients())
+      Case 3
+        charname$=GetCharacterName(Clients())+"(server) also this is not good, you better see a sDoctor"
+      Default
+        charname$=GetCharacterName(Clients())+" in "+GetAreaName(Clients())
+    EndSelect
+    iplist$=iplist$+Clients()\IP+"&"+charname$+"&"+Str(Clients()\CID)+"#"
+  Wend
+  PopMapPosition(Clients())
+  UnlockMutex(ListMutex)
+  iplist$=iplist$+"%"
+  SendTarget(Str(ClientID),iplist$,Server) 
+EndProcedure
+
 ProcedureDLL MasterAdvert(Port)
   Define msID=0,msinfo,NEvent,msPort=27016,retries,tick
   Define sr=-1
@@ -1120,7 +1146,11 @@ Procedure HandleAOCommand(ClientID)
             nmes\char=StringField(rawreceive$,4,"#")
             nmes\emote=StringField(rawreceive$,5,"#")
             nmes\message=StringField(rawreceive$,6,"#")
-            nmes\position=StringField(rawreceive$,7,"#")
+            If *usagePointer\pos=""
+              nmes\position=StringField(rawreceive$,7,"#")
+            Else
+              nmes\position=*usagePointer\pos
+            EndIf
             nmes\sfx=StringField(rawreceive$,8,"#")
             nmes\emotemod=Val(StringField(rawreceive$,9,"#"))
             nmes\animdelay=Val(StringField(rawreceive$,11,"#"))
@@ -1217,7 +1247,13 @@ Procedure HandleAOCommand(ClientID)
               Select Mid(ctparam$,8)
                 Case oppass$
                   If oppass$<>""
-                    SendTarget(Str(ClientID),LoginReply$,Server) 
+                    SendTarget(Str(ClientID),LoginReply$,Server)
+                    Select *usagePointer\type
+                      Case #VNO
+                        SendTarget(Str(ClientID),"MODOK#%",Server)
+                      Case #AOTWO
+                        SendTarget(Str(ClientID),"MK#%",Server)
+                    EndSelect
                     *usagePointer\perm=1
                     *usagePointer\ooct=1
                     rf=1
@@ -1225,6 +1261,12 @@ Procedure HandleAOCommand(ClientID)
                 Case adminpass$
                   If adminpass$<>""
                     SendTarget(Str(ClientID),LoginReply$,Server)
+                    Select *usagePointer\type
+                      Case #VNO
+                        SendTarget(Str(ClientID),"MODOK#%",Server)
+                      Case #AOTWO
+                        SendTarget(Str(ClientID),"MK#%",Server)
+                    EndSelect
                     *usagePointer\perm=2
                     *usagePointer\ooct=1
                     rf=1
@@ -1242,8 +1284,8 @@ Procedure HandleAOCommand(ClientID)
               EndIf
             Case "/ip"
               If *usagePointer\perm
-                If CommandThreading
-                  CreateThread(@ListIP(),ClientID)
+                If *usagePointer\type=#AOTWO
+                  ListIPSI(ClientID)
                 Else
                   ListIP(ClientID)
                 EndIf
@@ -1780,17 +1822,19 @@ Procedure HandleAOCommand(ClientID)
             PopMapPosition(Clients())
             UnlockMutex(ListMutex)     
           EndIf
-          If akchar=0 Or *usagePointer\CID=char Or BlockTaken=0
-            SendTarget(Str(ClientID),"PV#"+Str(*usagePointer\AID)+"#CID#"+Str(char)+"#%",Server)               
-            *usagePointer\CID=char                
-            WriteLog("chose character: "+GetCharacterName(*usagePointer),*usagePointer)
-            SendTarget(Str(ClientID),"HP#1#"+Str(Areas(*usagePointer\area)\good)+"#%",Server)
-            SendTarget(Str(ClientID),"HP#2#"+Str(Areas(*usagePointer\area)\evil)+"#%",Server)
-            If (MOTDevi And Characters(char)\evinumber<2 ) Or motd$<>"Take that!"
-              SendTarget(Str(ClientID),"MS#chat#dolannormal#Dolan#dolannormal#"+motd$+"#jud#0#0#"+Str(characternumber-1)+"#0#0#"+Str(MOTDevi)+"#"+Str(characternumber-1)+"#0#"+Str(modcol)+"#%",Server)
-            EndIf
-          EndIf 
-          rf=1
+          If *usagePointer\perm Or Characters(char)\pw=""
+            If akchar=0 Or *usagePointer\CID=char Or BlockTaken=0
+              SendTarget(Str(ClientID),"PV#"+Str(*usagePointer\AID)+"#CID#"+Str(char)+"#%",Server)               
+              *usagePointer\CID=char                
+              WriteLog("chose character: "+GetCharacterName(*usagePointer),*usagePointer)
+              SendTarget(Str(ClientID),"HP#1#"+Str(Areas(*usagePointer\area)\good)+"#%",Server)
+              SendTarget(Str(ClientID),"HP#2#"+Str(Areas(*usagePointer\area)\evil)+"#%",Server)
+              If (MOTDevi And Characters(char)\evinumber<2 ) Or motd$<>"Take that!"
+                SendTarget(Str(ClientID),"MS#chat#dolannormal#Dolan#dolannormal#"+motd$+"#jud#0#0#"+Str(characternumber-1)+"#0#0#"+Str(MOTDevi)+"#"+Str(characternumber-1)+"#0#"+Str(modcol)+"#%",Server)
+              EndIf
+              rf=1
+            EndIf          
+          EndIf
         EndIf
         
       Case "Req"
@@ -1802,7 +1846,7 @@ Procedure HandleAOCommand(ClientID)
             PushMapPosition(Clients())
             ResetMap(Clients())
             While NextMapElement(Clients())
-              If Clients()\CID=char
+              If Clients()\CID=start
                 If Clients()\area=*usagePointer\area
                   akchar=1
                   Break
@@ -1865,7 +1909,7 @@ Procedure HandleAOCommand(ClientID)
             UnlockMutex(ListMutex)     
           EndIf
           If akchar=0
-            If Characters(ncid)\pw=password$
+            If Characters(char)\pw=password$
               *usagePointer\CID=char
               SendTarget(Str(ClientID),"OC#"+Str(char)+"#0#%",Server)
               WriteLog("chose character: "+GetCharacterName(*usagePointer),*usagePointer)
@@ -1873,6 +1917,7 @@ Procedure HandleAOCommand(ClientID)
               *usagePointer\CID=char
               *usagePointer\perm=1
               SendTarget(Str(ClientID),"OC#"+Str(char)+"#3#%",Server)
+              SendTarget(Str(ClientID),"MK#%",Server)
               WriteLog("chose character: "+GetCharacterName(*usagePointer)+" and logged in as mod",*usagePointer)
             Else
               SendTarget(Str(ClientID),"OC#"+Str(char)+"#2#%",Server)
@@ -2547,8 +2592,8 @@ CompilerEndIf
 
 End
 ; IDE Options = PureBasic 5.31 (Windows - x86)
-; CursorPosition = 2495
-; FirstLine = 2484
+; CursorPosition = 2592
+; FirstLine = 2559
 ; Folding = ---
 ; EnableXP
 ; EnableCompileCount = 0
diff --git a/serverD.exe b/serverD.exe
index 14eb0b9..dbef791 100644
Binary files a/serverD.exe and b/serverD.exe differ
diff --git a/serverDco.exe b/serverDco.exe
index 8911a46..6f8f370 100644
Binary files a/serverDco.exe and b/serverDco.exe differ
diff --git a/serverd.txt b/serverd.txt
index 51c5278..466a945 100644
--- a/serverd.txt
+++ b/serverd.txt
@@ -1,4 +1,4 @@
 [Version]
-Compile=1285
-Build=142
+Compile=1292
+Build=144
 0.0.0.0
\ No newline at end of file
diff --git a/version.txt b/version.txt
index 51c5278..466a945 100644
--- a/version.txt
+++ b/version.txt
@@ -1,4 +1,4 @@
 [Version]
-Compile=1285
-Build=142
+Compile=1292
+Build=144
 0.0.0.0
\ No newline at end of file