diff --git a/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S b/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S
index c0d56a3b511..af825ca1f59 100644
--- a/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S
+++ b/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S
@@ -226,7 +226,7 @@
     cmp eax, ecx
     je 2f
 
-    /* Get the next entry and do the deletion*/
+    /* Get the next entry and do the deletion */
 #ifdef CONFIG_SMP
     push ebx
     mov ebx, [eax]
@@ -569,7 +569,7 @@ _ExpInterlockedPopEntrySListEnd@0:
     push ebx
     push ebp
 
-    /* Get desination pointer, exchange value and comperand value/address */
+    /* Get destination pointer, exchange value and comperand value/address */
     mov ebp, ecx
     mov ebx, [edx]
     mov ecx, [edx+4]
@@ -601,7 +601,7 @@ _ExpInterlockedPopEntrySListEnd@0:
     push ebp
     push ebp
 
-    /* Get desination pointer, exchange value and comperand value/address */
+    /* Get destination pointer, exchange value and comperand value/address */
     mov ebp, ecx
     mov ebx, [edx]
     mov ecx, [edx+4]
@@ -730,7 +730,7 @@ _ExpInterlockedPopEntrySListEnd@0:
     push ebp
     push ebp
 
-    /* Get desination pointer, exchange value and comperand value/address */
+    /* Get destination pointer, exchange value and comperand value/address */
     mov ebp, ecx
     mov ebx, [edx]
     mov ecx, [edx+4]
diff --git a/reactos/ntoskrnl/ex/i386/interlck_asm.S b/reactos/ntoskrnl/ex/i386/interlck_asm.S
index 0a81f482ffc..40c2c256c53 100644
--- a/reactos/ntoskrnl/ex/i386/interlck_asm.S
+++ b/reactos/ntoskrnl/ex/i386/interlck_asm.S
@@ -239,7 +239,7 @@ _ExInterlockedInsertTailList@12:
     /* Restore flags */
     popfd
 
-    /* check if the list was empty and return NULL */
+    /* Check if the list was empty and return NULL */
     xor eax, edx
     jz 2f
 
diff --git a/reactos/ntoskrnl/ex/init.c b/reactos/ntoskrnl/ex/init.c
index 72f13b0570b..835796e4da3 100644
--- a/reactos/ntoskrnl/ex/init.c
+++ b/reactos/ntoskrnl/ex/init.c
@@ -986,7 +986,7 @@ ExpInitializeExecutive(IN ULONG Cpu,
     /* Setup bugcheck messages */
     KiInitializeBugCheck();
 
-    /* Setup initial system settings (FIXME: Needs Cm Rewrite) */
+    /* Setup initial system settings */
     CmGetSystemControlValues(LoaderBlock->RegistryBase, CmControlVector);
 
     /* Load static defaults for Service Pack 1 and add our SVN revision */
diff --git a/reactos/ntoskrnl/ex/resource.c b/reactos/ntoskrnl/ex/resource.c
index ad3e7c516a9..fe054e56ec2 100644
--- a/reactos/ntoskrnl/ex/resource.c
+++ b/reactos/ntoskrnl/ex/resource.c
@@ -6,14 +6,6 @@
  * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
  */
 
-/*
- * WARNING:
- * This implementation is the Windows NT 5.x one.
- * Vista has optimized the OwnerThread entry array and the internals of
- * ExpFindEntryForThread and ExpFindFreeEntry probably need to be modified
- * accordingly in order to support the WDK.
- */
-
 /* INCLUDES *****************************************************************/
 
 #include <ntoskrnl.h>
diff --git a/reactos/ntoskrnl/io/iomgr/iowork.c b/reactos/ntoskrnl/io/iomgr/iowork.c
index c3db3adaff5..594a875c8fe 100644
--- a/reactos/ntoskrnl/io/iomgr/iowork.c
+++ b/reactos/ntoskrnl/io/iomgr/iowork.c
@@ -26,7 +26,7 @@ IopWorkItemCallback(IN PVOID Parameter)
     /* Call the work routine */
     IoWorkItem->WorkerRoutine(DeviceObject, IoWorkItem->Context);
 
-    /* Dereferenece the device object */
+    /* Dereference the device object */
     ObDereferenceObject(DeviceObject);
 }
 
diff --git a/reactos/ntoskrnl/ob/obdir.c b/reactos/ntoskrnl/ob/obdir.c
index 1b7f1b3ff12..b7da8e05b00 100644
--- a/reactos/ntoskrnl/ob/obdir.c
+++ b/reactos/ntoskrnl/ob/obdir.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS Kernel
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            ntoskrnl/ob/dirobj.c
+ * FILE:            ntoskrnl/ob/obdir.c
  * PURPOSE:         Manages the Object Manager's Directory Implementation,
  *                  such as functions for addition, deletion and lookup into
  *                  the Object Manager's namespace. These routines are separate
diff --git a/reactos/ntoskrnl/ob/obinit.c b/reactos/ntoskrnl/ob/obinit.c
index 9083f1af7f8..51a2f9fca36 100644
--- a/reactos/ntoskrnl/ob/obinit.c
+++ b/reactos/ntoskrnl/ob/obinit.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS Kernel
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            ntoskrnl/ob/init.c
+ * FILE:            ntoskrnl/ob/obinit.c
  * PURPOSE:         Handles Object Manager Initialization and Shutdown
  * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
  *                  Eric Kohl
diff --git a/reactos/ntoskrnl/ob/oblife.c b/reactos/ntoskrnl/ob/oblife.c
index 91b550d3533..570225a6329 100644
--- a/reactos/ntoskrnl/ob/oblife.c
+++ b/reactos/ntoskrnl/ob/oblife.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS Kernel
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            ntoskrnl/ob/create.c
+ * FILE:            ntoskrnl/ob/oblife.c
  * PURPOSE:         Manages the lifetime of an Object, including its creation,
  *                  and deletion, as well as setting or querying any of its
  *                  information while it is active. Since Object Types are also
diff --git a/reactos/ntoskrnl/ob/oblink.c b/reactos/ntoskrnl/ob/oblink.c
index c173d1baf8a..bc742e339d8 100644
--- a/reactos/ntoskrnl/ob/oblink.c
+++ b/reactos/ntoskrnl/ob/oblink.c
@@ -1,7 +1,7 @@
 /*
 * PROJECT:         ReactOS Kernel
 * LICENSE:         GPL - See COPYING in the top level directory
-* FILE:            ntoskrnl/ob/symlink.c
+* FILE:            ntoskrnl/ob/oblink.c
 * PURPOSE:         Implements symbolic links
 * PROGRAMMERS:     Alex Ionescu (alex@relsoft.net)
 *                  David Welch (welch@mcmail.com)
diff --git a/reactos/ntoskrnl/ob/obname.c b/reactos/ntoskrnl/ob/obname.c
index 513032127e2..a23a2df9e89 100644
--- a/reactos/ntoskrnl/ob/obname.c
+++ b/reactos/ntoskrnl/ob/obname.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS Kernel
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            ntoskrnl/ob/namespce.c
+ * FILE:            ntoskrnl/ob/obname.c
  * PURPOSE:         Manages all functions related to the Object Manager name-
  *                  space, such as finding objects or querying their names.
  * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
diff --git a/reactos/ntoskrnl/ob/obref.c b/reactos/ntoskrnl/ob/obref.c
index 0ebb04b5fbd..eaa45237217 100644
--- a/reactos/ntoskrnl/ob/obref.c
+++ b/reactos/ntoskrnl/ob/obref.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS Kernel
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            ntoskrnl/ob/refderef.c
+ * FILE:            ntoskrnl/ob/obref.c
  * PURPOSE:         Manages the referencing and de-referencing of all Objects,
  *                  as well as the Object Fast Reference implementation.
  * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
diff --git a/reactos/ntoskrnl/ob/obsdcach.c b/reactos/ntoskrnl/ob/obsdcach.c
index b252ae61450..c339c8cdbe9 100644
--- a/reactos/ntoskrnl/ob/obsdcach.c
+++ b/reactos/ntoskrnl/ob/obsdcach.c
@@ -1,10 +1,9 @@
 /*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            ntoskrnl/ob/sdcache.c
- * PURPOSE:         No purpose listed.
- *
- * PROGRAMMERS:     David Welch (welch@cwcom.net)
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         GPL - See COPYING in the top level directory
+ * FILE:            ntoskrnl/ob/obsdcach.c
+ * PURPOSE:         Security Descriptor Caching
+ * PROGRAMMERS:     Aleksey Bragin (aleksey@reactos.org)
  */
 
 /* INCLUDES *******************************************************************/