diff --git a/reactos/subsys/system/servman/about.c b/reactos/subsys/system/servman/about.c
index 0bcae718040..3de098c93a6 100644
--- a/reactos/subsys/system/servman/about.c
+++ b/reactos/subsys/system/servman/about.c
@@ -1,3 +1,12 @@
+/*
+ * PROJECT:     ReactOS Services
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        subsys/system/servman/about.c
+ * PURPOSE:     About dialog box message handler
+ * COPYRIGHT:   Copyright 2005 Ged Murphy <gedmurphy@gmail.com>
+ *               
+ */
+
 #include "servman.h"
 
 extern HINSTANCE hInstance;
diff --git a/reactos/subsys/system/servman/geterror.c b/reactos/subsys/system/servman/geterror.c
index 7b8c8fb5dcc..5786eab62c9 100644
--- a/reactos/subsys/system/servman/geterror.c
+++ b/reactos/subsys/system/servman/geterror.c
@@ -1,3 +1,4 @@
+
 #include "servman.h"
 /* temp file for debugging */
 
diff --git a/reactos/subsys/system/servman/propsheet.c b/reactos/subsys/system/servman/propsheet.c
index ad8637a48ef..d8a5b10975a 100644
--- a/reactos/subsys/system/servman/propsheet.c
+++ b/reactos/subsys/system/servman/propsheet.c
@@ -1,3 +1,12 @@
+/*
+ * PROJECT:     ReactOS Services
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        subsys/system/servman/propsheet.c
+ * PURPOSE:     Property dialog box message handler
+ * COPYRIGHT:   Copyright 2005 Ged Murphy <gedmurphy@gmail.com>
+ *               
+ */
+
 #include "servman.h"
 
 extern HINSTANCE hInstance;
diff --git a/reactos/subsys/system/servman/query.c b/reactos/subsys/system/servman/query.c
index 687aab3296d..7cfb2e29cae 100644
--- a/reactos/subsys/system/servman/query.c
+++ b/reactos/subsys/system/servman/query.c
@@ -1,3 +1,12 @@
+/*
+ * PROJECT:     ReactOS Services
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        subsys/system/servman/query.c
+ * PURPOSE:     Query service information
+ * COPYRIGHT:   Copyright 2005 Ged Murphy <gedmurphy@gmail.com>
+ *               
+ */
+
 #include "servman.h"
 
 extern HINSTANCE hInstance;
@@ -18,7 +27,7 @@ VOID FreeMemory(VOID)
 BOOL
 RefreshServiceList(VOID)
 {
-    LV_ITEM item;
+    LVITEM item;
     TCHAR szNumServices[32];
     TCHAR szStatus[128];
     DWORD NumServices = 0;
@@ -76,12 +85,17 @@ RefreshServiceList(VOID)
 
             ZeroMemory(&item, sizeof(LV_ITEM));
             item.mask = LVIF_TEXT;
-            //item.iImage = 0;
+            item.iImage = 0;
             item.pszText = pServiceStatus[Index].lpDisplayName;
+            /*_tcsncpy(item.pszText,
+                    pServiceStatus[Index].lpDisplayName,                    
+                    sizeof(pServiceStatus[Index].lpDisplayName));*/
+
             item.iItem = ListView_GetItemCount(hListView);
-            //item.lParam = 0;
+            item.lParam = 0;
             item.iItem = ListView_InsertItem(hListView, &item);
 
+            
 
             /* set the description */
             dwValueSize = 0;
@@ -149,7 +163,7 @@ RefreshServiceList(VOID)
                                 _T("Start"),
                                 NULL,
                                 NULL,
-                                (LPBYTE)StartUp,
+                                (LPBYTE)&StartUp,
                                 &dwValueSize))
             {
                 RegCloseKey(hKey);
@@ -160,21 +174,21 @@ RefreshServiceList(VOID)
             {
                 LoadString(hInstance, IDS_SERVICES_AUTO, szStatus, 128);
                 item.pszText = szStatus;
-                item.iSubItem = 2;
+                item.iSubItem = 3;
                 SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
             }
             else if (StartUp == 0x03)
             {
                 LoadString(hInstance, IDS_SERVICES_MAN, szStatus, 128);
                 item.pszText = szStatus;
-                item.iSubItem = 2;
+                item.iSubItem = 3;
                 SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
             }
             else if (StartUp == 0x04)
             {
                 LoadString(hInstance, IDS_SERVICES_DIS, szStatus, 128);
                 item.pszText = szStatus;
-                item.iSubItem = 2;
+                item.iSubItem = 3;
                 SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
             }
 
diff --git a/reactos/subsys/system/servman/servman.c b/reactos/subsys/system/servman/servman.c
index 30f7477d47d..fd4a6246b64 100644
--- a/reactos/subsys/system/servman/servman.c
+++ b/reactos/subsys/system/servman/servman.c
@@ -1,5 +1,13 @@
-#include "servman.h"
+/*
+ * PROJECT:     ReactOS Services
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        subsys/system/servman/servman.c
+ * PURPOSE:     Main window message handler
+ * COPYRIGHT:   Copyright 2005 Ged Murphy <gedmurphy@gmail.com>
+ *               
+ */
 
+#include "servman.h"
 
 const TCHAR ClassName[] = _T("ServiceManager");