diff --git a/reactos/lib/rtl/random.c b/reactos/lib/rtl/random.c
index de79f49cc4c..a6c70d96586 100644
--- a/reactos/lib/rtl/random.c
+++ b/reactos/lib/rtl/random.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: random.c,v 1.2 2004/08/05 18:17:37 ion Exp $
+/* $Id: random.c,v 1.3 2004/08/07 19:13:25 ion Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -81,6 +81,9 @@ static ULONG SavedValue[128] =
  * RETURNS
  *  It returns a random number distributed over [0..MAXLONG-1].
  */
+/*
+* @implemented
+*/
 ULONG STDCALL
 RtlRandom (IN OUT PULONG Seed)
 {
diff --git a/reactos/lib/rtl/sd.c b/reactos/lib/rtl/sd.c
index a0999a4bb98..f32de1243b0 100644
--- a/reactos/lib/rtl/sd.c
+++ b/reactos/lib/rtl/sd.c
@@ -1,4 +1,4 @@
-/* $Id: sd.c,v 1.2 2004/08/05 18:17:37 ion Exp $
+/* $Id: sd.c,v 1.3 2004/08/07 19:13:25 ion Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -17,6 +17,9 @@
 
 /* FUNCTIONS ***************************************************************/
 
+/*
+* @implemented
+*/
 NTSTATUS STDCALL
 RtlCreateSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor,
                             ULONG Revision)
diff --git a/reactos/lib/rtl/unicode.c b/reactos/lib/rtl/unicode.c
index 77b15219beb..4845e48f51c 100644
--- a/reactos/lib/rtl/unicode.c
+++ b/reactos/lib/rtl/unicode.c
@@ -46,7 +46,9 @@ extern BOOLEAN NlsMbOemCodePageTag;
 /* FUNCTIONS *****************************************************************/
 
 
-
+/*
+* @implemented
+*/
 WCHAR STDCALL
 RtlAnsiCharToUnicodeChar (IN CHAR AnsiChar)
 {
diff --git a/reactos/lib/rtl/version.c b/reactos/lib/rtl/version.c
index 8a5f2441ed0..cc74bfa1a97 100644
--- a/reactos/lib/rtl/version.c
+++ b/reactos/lib/rtl/version.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: version.c,v 1.2 2004/08/05 18:17:37 ion Exp $
+/* $Id: version.c,v 1.3 2004/08/07 19:13:25 ion Exp $
  *
  * PROJECT:           ReactOS kernel
  * PURPOSE:           Runtime code
@@ -40,6 +40,9 @@ extern ULONG NtGlobalFlag;
 
 /* FUNCTIONS ****************************************************************/
 
+/*
+* @implemented
+*/
 NTSTATUS STDCALL
 RtlGetVersion(RTL_OSVERSIONINFOW *Info)
 {
diff --git a/reactos/ntoskrnl/dbg/i386/dis-asm.h b/reactos/ntoskrnl/dbg/i386/dis-asm.h
index efd2bceefa0..d2d1bfe712e 100644
--- a/reactos/ntoskrnl/dbg/i386/dis-asm.h
+++ b/reactos/ntoskrnl/dbg/i386/dis-asm.h
@@ -32,8 +32,8 @@ extern "C" {
 #endif
 
 #if 0
-#include <stdio.h>
-#include "bfd.h"
+/* #include <stdio.h> */
+/* #include "bfd.h" */
 #endif
 
 typedef int (*fprintf_ftype) PARAMS((PTR, const char*, ...));
diff --git a/reactos/ntoskrnl/ex/i386/interlck.c b/reactos/ntoskrnl/ex/i386/interlck.c
index 2a83bb57a26..a60603e3ddf 100644
--- a/reactos/ntoskrnl/ex/i386/interlck.c
+++ b/reactos/ntoskrnl/ex/i386/interlck.c
@@ -1,4 +1,4 @@
-/* $Id: interlck.c,v 1.6 2003/12/30 18:52:03 fireball Exp $
+/* $Id: interlck.c,v 1.7 2004/08/07 19:13:26 ion Exp $
  *
  * reactos/ntoskrnl/ex/i386/interlck.c
  *
@@ -8,6 +8,9 @@
 
 #if defined(__GNUC__)
 
+/*
+ * @implemented
+ */
 INTERLOCKED_RESULT FASTCALL
 Exfi386InterlockedIncrementLong(IN PLONG Addend);
 
@@ -20,6 +23,9 @@ __asm__("\n\t.global @Exfi386InterlockedIncrementLong@4\n\t"
 
 #elif defined(_MSC_VER)
 
+/*
+ * @implemented
+ */
 __declspec(naked)
 INTERLOCKED_RESULT FASTCALL
 Exfi386InterlockedIncrementLong(IN PLONG Addend)
@@ -37,6 +43,9 @@ Exfi386InterlockedIncrementLong(IN PLONG Addend)
 
 #if defined(__GNUC__)
 
+/*
+ * @implemented
+ */
 INTERLOCKED_RESULT FASTCALL
 Exfi386InterlockedDecrementLong(IN PLONG Addend);
 
@@ -49,6 +58,9 @@ __asm__("\n\t.global @Exfi386InterlockedDecrementLong@4\n\t"
 
 #elif defined(_MSC_VER)
 
+/*
+ * @implemented
+ */
 __declspec(naked)
 INTERLOCKED_RESULT FASTCALL
 Exfi386InterlockedDecrementLong(IN PLONG Addend)
@@ -66,6 +78,9 @@ Exfi386InterlockedDecrementLong(IN PLONG Addend)
 
 #if defined(__GNUC__)
 
+/*
+ * @implemented
+ */
 ULONG FASTCALL
 Exfi386InterlockedExchangeUlong(IN PULONG Target,
 				IN ULONG Value);
@@ -78,6 +93,9 @@ __asm__("\n\t.global @Exfi386InterlockedExchangeUlong@8\n\t"
 
 #elif defined(_MSC_VER)
 
+/*
+ * @implemented
+ */
 __declspec(naked)
 ULONG FASTCALL
 Exfi386InterlockedExchangeUlong(IN PULONG Target,
@@ -192,6 +210,9 @@ Exi386InterlockedExchangeUlong(IN PULONG Target,
  * STDCALL : _InterlockedIncrement@4
  */
 #if defined(__GNUC__)
+/*
+ * @implemented
+ */
 LONG FASTCALL
 InterlockedIncrement(PLONG Addend);
 /*
@@ -210,7 +231,9 @@ __asm__("\n\t.global @InterlockedIncrement@4\n\t"
 	"ret\n\t");
 
 #elif defined(_MSC_VER)
-
+/*
+ * @implemented
+ */
 __declspec(naked)
 LONG FASTCALL
 InterlockedIncrement(PLONG Addend)
@@ -231,6 +254,9 @@ InterlockedIncrement(PLONG Addend)
  * STDCALL : _InterlockedDecrement@4
  */
 #if defined(__GNUC__)
+/*
+ * @implemented
+ */
 LONG FASTCALL
 InterlockedDecrement(PLONG Addend);
 
@@ -243,6 +269,9 @@ __asm__("\n\t.global @InterlockedDecrement@4\n\t"
 
 #elif defined(_MSC_VER)
 
+/*
+ * @implemented
+ */
 __declspec(naked)
 LONG FASTCALL
 InterlockedDecrement(PLONG Addend)
@@ -264,6 +293,9 @@ InterlockedDecrement(PLONG Addend)
  */
 
 #if defined(__GNUC__)
+/*
+ * @implemented
+ */
 LONG FASTCALL
 InterlockedExchange(PLONG Target,
 		    LONG Value);
@@ -275,7 +307,9 @@ __asm__("\n\t.global @InterlockedExchange@8\n\t"
 	"ret\n\t");
 
 #elif defined(_MSC_VER)
-
+/*
+ * @implemented
+ */
 __declspec(naked)
 LONG FASTCALL
 InterlockedExchange(PLONG Target,
@@ -295,7 +329,9 @@ InterlockedExchange(PLONG Target,
  * STDCALL: _InterlockedExchangeAdd@8
  */
 #if defined(__GNUC__)
-
+/*
+ * @implemented
+ */
 LONG FASTCALL
 InterlockedExchangeAdd(PLONG Addend,
 		       LONG Value);
@@ -307,7 +343,9 @@ __asm__("\n\t.global @InterlockedExchangeAdd@8\n\t"
 	"ret\n\t");
 
 #elif defined(_MSC_VER)
-
+/*
+ * @implemented
+ */
 __declspec(naked)
 LONG FASTCALL
 InterlockedExchangeAdd(PLONG Addend,
diff --git a/reactos/ntoskrnl/ex/power.c b/reactos/ntoskrnl/ex/power.c
index 9892eca9ebc..c3bfac0de2c 100644
--- a/reactos/ntoskrnl/ex/power.c
+++ b/reactos/ntoskrnl/ex/power.c
@@ -32,6 +32,9 @@ NtSetSystemPowerState(IN POWER_ACTION SystemAction,
   return(STATUS_NOT_IMPLEMENTED);
 }
 
+/*
+ * @implemented
+ */
 NTSTATUS STDCALL 
 NtShutdownSystem(IN SHUTDOWN_ACTION Action)
 {
diff --git a/reactos/ntoskrnl/io/parttab.c b/reactos/ntoskrnl/io/parttab.c
index 4c6895a7bd4..855e1b5fd99 100644
--- a/reactos/ntoskrnl/io/parttab.c
+++ b/reactos/ntoskrnl/io/parttab.c
@@ -1,4 +1,4 @@
-/* $Id: parttab.c,v 1.6 2003/07/11 01:23:14 royce Exp $
+/* $Id: parttab.c,v 1.7 2004/08/07 19:13:26 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -19,6 +19,9 @@
 
 /* FUNCTIONS *****************************************************************/
 
+/*
+ * @implemented
+ */
 NTSTATUS STDCALL
 IoReadPartitionTable(PDEVICE_OBJECT DeviceObject,
 		     ULONG SectorSize,
diff --git a/reactos/ntoskrnl/mm/cont.c b/reactos/ntoskrnl/mm/cont.c
index 7312a6c5ffc..60efa9bcb7f 100644
--- a/reactos/ntoskrnl/mm/cont.c
+++ b/reactos/ntoskrnl/mm/cont.c
@@ -1,4 +1,4 @@
-/* $Id: cont.c,v 1.32 2004/08/01 07:24:57 hbirr Exp $
+/* $Id: cont.c,v 1.33 2004/08/07 19:13:26 ion Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -31,6 +31,9 @@ MmFreeContinuousPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
    }
 }
 
+/*
+ * @implemented
+ */
 PVOID STDCALL
 MmAllocateContiguousAlignedMemory(IN ULONG NumberOfBytes,
                                   IN PHYSICAL_ADDRESS LowestAcceptableAddress OPTIONAL,
diff --git a/reactos/ntoskrnl/mm/mdl.c b/reactos/ntoskrnl/mm/mdl.c
index 9939789d6c7..7eb63e04c98 100644
--- a/reactos/ntoskrnl/mm/mdl.c
+++ b/reactos/ntoskrnl/mm/mdl.c
@@ -1,4 +1,4 @@
-/* $Id: mdl.c,v 1.66 2004/08/01 07:24:58 hbirr Exp $
+/* $Id: mdl.c,v 1.67 2004/08/07 19:13:26 ion Exp $
  *
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -750,6 +750,9 @@ MmMapMemoryDumpMdl (PVOID Unknown0)
    UNIMPLEMENTED;
 }
 
+/*
+ * @unimplemented
+ */
 PMDL STDCALL
 MmAllocatePagesForMdl ( IN PHYSICAL_ADDRESS LowAddress,
                         IN PHYSICAL_ADDRESS HighAddress,
@@ -781,10 +784,13 @@ MmAllocatePagesForMdl ( IN PHYSICAL_ADDRESS LowAddress,
    /* SkipBytes must be a multiple of the page size */
    assert((SkipBytes.QuadPart % PAGE_SIZE) == 0);
    
-   DPRINT1("MmAllocatePagesForMdl(): Unimplemented.\n");
+   UNIMPLEMENTED;
    return(NULL);
 }
 
+/*
+ * @unimplemented
+ */
 VOID STDCALL
 MmFreePagesFromMdl ( IN PMDL Mdl )
 {
@@ -801,9 +807,12 @@ MmFreePagesFromMdl ( IN PMDL Mdl )
    
    */
 
-   DPRINT1("MmFreePagesFromMdl(): Unimplemented.\n");
+   UNIMPLEMENTED;
 }
 
+/*
+ * @unimplemented
+ */
 PVOID STDCALL
 MmMapLockedPagesSpecifyCache ( IN PMDL Mdl,
                                IN KPROCESSOR_MODE AccessMode,
@@ -812,7 +821,7 @@ MmMapLockedPagesSpecifyCache ( IN PMDL Mdl,
                                IN ULONG BugCheckOnFailure,
                                IN ULONG Priority )
 {
-   DPRINT1("MmMapLockedPagesSpecifyCache(): Ignoring extra parameters.\n");
+   UNIMPLEMENTED;
    return MmMapLockedPages (Mdl, AccessMode);
 }
 
diff --git a/reactos/ntoskrnl/nt/vdm.c b/reactos/ntoskrnl/nt/vdm.c
index 1e7636d4895..129ffba6770 100644
--- a/reactos/ntoskrnl/nt/vdm.c
+++ b/reactos/ntoskrnl/nt/vdm.c
@@ -42,6 +42,9 @@ NtEarlyInitVdm(VOID)
   memcpy(OrigBDA, (PVOID)0x400, 256);
 }
 
+/*
+ * @implemented
+ */
 NTSTATUS STDCALL NtVdmControl(ULONG ControlCode,
 			      PVOID ControlData)
 {
diff --git a/reactos/ntoskrnl/po/power.c b/reactos/ntoskrnl/po/power.c
index beab3d20ba8..c6cbbfaaf91 100644
--- a/reactos/ntoskrnl/po/power.c
+++ b/reactos/ntoskrnl/po/power.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: power.c,v 1.9 2004/07/17 03:06:01 ion Exp $
+/* $Id: power.c,v 1.10 2004/08/07 19:13:26 ion Exp $
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/po/power.c
  * PURPOSE:         Power Manager
@@ -36,7 +36,9 @@
 
 PDEVICE_NODE PopSystemPowerDeviceNode = NULL;
 
-
+/*
+ * @implemented
+ */
 NTSTATUS
 STDCALL
 PoCallDriver(
diff --git a/reactos/ntoskrnl/ps/create.c b/reactos/ntoskrnl/ps/create.c
index 3dc63cc225e..6fcb0634f0a 100644
--- a/reactos/ntoskrnl/ps/create.c
+++ b/reactos/ntoskrnl/ps/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.76 2004/07/19 06:08:21 ion Exp $
+/* $Id: create.c,v 1.77 2004/08/07 19:13:26 ion Exp $
  *
  * COPYRIGHT:              See COPYING in the top level directory
  * PROJECT:                ReactOS kernel
@@ -53,6 +53,9 @@ PiThreadNotifyRoutine[MAX_THREAD_NOTIFY_ROUTINE_COUNT];
 
 /* FUNCTIONS ***************************************************************/
 
+/*
+ * @implemented
+ */
 NTSTATUS STDCALL
 PsAssignImpersonationToken(PETHREAD Thread,
 			   HANDLE TokenHandle)
@@ -238,7 +241,9 @@ NtImpersonateThread(IN HANDLE ThreadHandle,
   return STATUS_SUCCESS;
 }
 
-
+/*
+ * @implemented
+ */
 NTSTATUS STDCALL
 NtOpenThreadToken (IN HANDLE ThreadHandle,
 		   IN ACCESS_MASK DesiredAccess,
diff --git a/reactos/ntoskrnl/ps/tinfo.c b/reactos/ntoskrnl/ps/tinfo.c
index 6736c38a715..24bb575c4a4 100644
--- a/reactos/ntoskrnl/ps/tinfo.c
+++ b/reactos/ntoskrnl/ps/tinfo.c
@@ -1,4 +1,4 @@
-/* $Id: tinfo.c,v 1.26 2004/08/05 11:38:01 jimtabor Exp $
+/* $Id: tinfo.c,v 1.27 2004/08/07 19:13:26 ion Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -22,6 +22,9 @@
 
 /* FUNCTIONS *****************************************************************/
 
+/*
+ * @unimplemented
+ */
 NTSTATUS STDCALL
 NtSetInformationThread (IN HANDLE ThreadHandle,
 			IN THREADINFOCLASS ThreadInformationClass,
@@ -207,7 +210,9 @@ NtSetInformationThread (IN HANDLE ThreadHandle,
   return Status;
 }
 
-
+/*
+ * @implemented
+ */
 NTSTATUS STDCALL
 NtQueryInformationThread (IN	HANDLE		ThreadHandle,
 			  IN	THREADINFOCLASS	ThreadInformationClass,
diff --git a/reactos/ntoskrnl/rtl/bit.c b/reactos/ntoskrnl/rtl/bit.c
index 8091594847b..ce6925a039d 100644
--- a/reactos/ntoskrnl/rtl/bit.c
+++ b/reactos/ntoskrnl/rtl/bit.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: bit.c,v 1.1 2004/02/02 00:36:36 ekohl Exp $
+/* $Id: bit.c,v 1.2 2004/08/07 19:13:27 ion Exp $
  *
  * PROJECT:           ReactOS kernel
  * PURPOSE:           Runtime code
@@ -31,6 +31,9 @@
 
 /* FUNCTIONS ****************************************************************/
 
+/*
+ * @implemented
+ */
 CCHAR STDCALL
 RtlFindLeastSignificantBit (IN ULONGLONG Set)
 {
@@ -48,7 +51,9 @@ RtlFindLeastSignificantBit (IN ULONGLONG Set)
   return -1;
 }
 
-
+/*
+ * @implemented
+ */
 CCHAR STDCALL
 RtlFindMostSignificantBit (IN ULONGLONG Set)
 {
diff --git a/reactos/ntoskrnl/rtl/message.c b/reactos/ntoskrnl/rtl/message.c
index 799e37d01e7..b2305fefc73 100644
--- a/reactos/ntoskrnl/rtl/message.c
+++ b/reactos/ntoskrnl/rtl/message.c
@@ -1,4 +1,4 @@
-/* $Id: message.c,v 1.5 2002/09/15 10:45:05 guido Exp $
+/* $Id: message.c,v 1.6 2004/08/07 19:13:27 ion Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -19,6 +19,9 @@
 
 /* FUNCTIONS *****************************************************************/
 
+/*
+ * @implemented
+ */
 NTSTATUS STDCALL
 RtlFindMessage(PVOID BaseAddress,
 	       ULONG Type,
diff --git a/reactos/ntoskrnl/se/access.c b/reactos/ntoskrnl/se/access.c
index 7c4cdd04d46..06781928300 100644
--- a/reactos/ntoskrnl/se/access.c
+++ b/reactos/ntoskrnl/se/access.c
@@ -1,4 +1,4 @@
-/* $Id: access.c,v 1.5 2004/08/03 19:20:39 ion Exp $
+/* $Id: access.c,v 1.6 2004/08/07 19:13:27 ion Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -18,6 +18,9 @@
 
 /* FUNCTIONS ***************************************************************/
 
+/*
+ * @implemented
+ */
 BOOLEAN
 STDCALL
 RtlAreAllAccessesGranted (
diff --git a/reactos/ntoskrnl/se/lsa.c b/reactos/ntoskrnl/se/lsa.c
index 64c3a12c389..e9ee8405cbd 100644
--- a/reactos/ntoskrnl/se/lsa.c
+++ b/reactos/ntoskrnl/se/lsa.c
@@ -1,12 +1,14 @@
-/* $Id: lsa.c,v 1.4 2004/08/03 19:20:39 ion Exp $
+/* $Id: lsa.c,v 1.5 2004/08/07 19:13:27 ion Exp $
  */
 #include <ddk/ntddk.h>
 
 #define NDEBUG
 #include <internal/debug.h>
 
-
 /* LsaCallAuthenticationPackage@28 */
+/*
+ * @unimplemented
+ */
 NTSTATUS STDCALL LsaCallAuthenticationPackage (
     DWORD Unknown0,
     DWORD Unknown1,
@@ -21,6 +23,9 @@ NTSTATUS STDCALL LsaCallAuthenticationPackage (
 }
 
 /* LsaDeregisterLogonProcess@8 */
+/*
+ * @unimplemented
+ */
 NTSTATUS STDCALL LsaDeregisterLogonProcess (
     DWORD Unknown0,
     DWORD Unknown1
@@ -30,6 +35,9 @@ NTSTATUS STDCALL LsaDeregisterLogonProcess (
 }
 
 /* LsaFreeReturnBuffer@4 */
+/*
+ * @implemented
+ */
 NTSTATUS STDCALL LsaFreeReturnBuffer (PVOID Buffer)
 {
     ULONG Size = 0; /* required by MEM_RELEASE */
@@ -43,6 +51,9 @@ NTSTATUS STDCALL LsaFreeReturnBuffer (PVOID Buffer)
 }
 
 /* LsaLogonUser@56 */
+/*
+ * @unimplemented
+ */
 NTSTATUS STDCALL LsaLogonUser (
     DWORD Unknown0,
     DWORD Unknown1,
@@ -64,6 +75,9 @@ NTSTATUS STDCALL LsaLogonUser (
 }
 
 /* LsaLookupAuthenticationPackage@12 */
+/*
+ * @unimplemented
+ */
 NTSTATUS STDCALL LsaLookupAuthenticationPackage (
     DWORD	Unknown0,
     DWORD	Unknown1,
@@ -74,6 +88,9 @@ NTSTATUS STDCALL LsaLookupAuthenticationPackage (
 }
 
 /* LsaRegisterLogonProcess@12 */
+/*
+ * @unimplemented
+ */
 NTSTATUS STDCALL LsaRegisterLogonProcess (
     DWORD	Unknown0,
     DWORD	Unknown1,