diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..5823272
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Specify filepatterns you want to assign special attributes.
+
diff --git a/Include/Defs.h b/Include/Defs.h
index cbce197..4bb0cda 100644
--- a/Include/Defs.h
+++ b/Include/Defs.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Include/DeviceDefs.h b/Include/DeviceDefs.h
index f83f78c..6e858b1 100644
--- a/Include/DeviceDefs.h
+++ b/Include/DeviceDefs.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Include/Warning.h b/Include/Warning.h
index 96a8e2a..99d24b6 100644
--- a/Include/Warning.h
+++ b/Include/Warning.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Include/dump.h b/Include/dump.h
index cbf625f..686ce21 100644
--- a/Include/dump.h
+++ b/Include/dump.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Include/guarddefs.h b/Include/guarddefs.h
index 09a7d76..b2e8495 100644
--- a/Include/guarddefs.h
+++ b/Include/guarddefs.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Include/listdefs.h b/Include/listdefs.h
index 38572b4..cd68f30 100644
--- a/Include/listdefs.h
+++ b/Include/listdefs.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Include/statusdefs.h b/Include/statusdefs.h
index 22b4182..4d954b5 100644
--- a/Include/statusdefs.h
+++ b/Include/statusdefs.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Include/typesdefs.h b/Include/typesdefs.h
index d83e64e..3dd22e6 100644
--- a/Include/typesdefs.h
+++ b/Include/typesdefs.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Include/ver.h b/Include/ver.h
index 069fdc3..2fc8de4 100644
--- a/Include/ver.h
+++ b/Include/ver.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Include/wow64.h b/Include/wow64.h
index 2d74bff..7a42b7c 100644
--- a/Include/wow64.h
+++ b/Include/wow64.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Sea/AMD64/AMD64.asm b/Projects/Sea/AMD64/AMD64.asm
index 75a1e34..ebd0436 100644
--- a/Projects/Sea/AMD64/AMD64.asm
+++ b/Projects/Sea/AMD64/AMD64.asm
@@ -12,7 +12,7 @@
 ; for the specific language governing rights and limitations under the
 ; License.
 ;
-; The Initial Developer of the Original e is blindtiger.
+; The Initial Developer of the Original Code is blindtiger.
 ;
 ;
 
diff --git a/Projects/Sea/I386/I386.asm b/Projects/Sea/I386/I386.asm
index fd7e3ce..ee0e190 100644
--- a/Projects/Sea/I386/I386.asm
+++ b/Projects/Sea/I386/I386.asm
@@ -12,7 +12,7 @@
 ; for the specific language governing rights and limitations under the
 ; License.
 ;
-; The Initial Developer of the Original e is blindtiger.
+; The Initial Developer of the Original Code is blindtiger.
 ;
 ;
 
diff --git a/Projects/Sea/Makefile b/Projects/Sea/Makefile
index dce9a0d..59e35f2 100644
--- a/Projects/Sea/Makefile
+++ b/Projects/Sea/Makefile
@@ -12,7 +12,7 @@
 # for the specific language governing rights and limitations under the
 # License.
 #
-# The Initial Developer of the Original e is blindtiger.
+# The Initial Developer of the Original Code is blindtiger.
 #
 #
 
diff --git a/Projects/Sea/Sea.c b/Projects/Sea/Sea.c
index 584c0d7..0f22eca 100644
--- a/Projects/Sea/Sea.c
+++ b/Projects/Sea/Sea.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Sea/Sea.def b/Projects/Sea/Sea.def
index 6d4f663..8989ec6 100644
--- a/Projects/Sea/Sea.def
+++ b/Projects/Sea/Sea.def
@@ -12,7 +12,7 @@
 ; for the specific language governing rights and limitations under the
 ; License.
 ;
-; The Initial Developer of the Original e is blindtiger.
+; The Initial Developer of the Original Code is blindtiger.
 ;
 ;
 
diff --git a/Projects/Sea/Sea.h b/Projects/Sea/Sea.h
index 8ef5a3e..37b63b8 100644
--- a/Projects/Sea/Sea.h
+++ b/Projects/Sea/Sea.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Sea/Sea.rc b/Projects/Sea/Sea.rc
index 7a1a2af..48e79b1 100644
--- a/Projects/Sea/Sea.rc
+++ b/Projects/Sea/Sea.rc
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Sea/Sysload.c b/Projects/Sea/Sysload.c
index 287c9cf..1560277 100644
--- a/Projects/Sea/Sysload.c
+++ b/Projects/Sea/Sysload.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Sea/Sysload.h b/Projects/Sea/Sysload.h
index 617d384..09f7985 100644
--- a/Projects/Sea/Sysload.h
+++ b/Projects/Sea/Sysload.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/AMD64/AMD64.asm b/Projects/Shark/AMD64/AMD64.asm
index 75e7409..7c8605e 100644
--- a/Projects/Shark/AMD64/AMD64.asm
+++ b/Projects/Shark/AMD64/AMD64.asm
@@ -12,7 +12,7 @@
 ; for the specific language governing rights and limitations under the
 ; License.
 ;
-; The Initial Developer of the Original e is blindtiger.
+; The Initial Developer of the Original Code is blindtiger.
 ;
 ;
 
diff --git a/Projects/Shark/AMD64/CmpAMD64.asm b/Projects/Shark/AMD64/CmpAMD64.asm
index 472dc28..c53ac08 100644
--- a/Projects/Shark/AMD64/CmpAMD64.asm
+++ b/Projects/Shark/AMD64/CmpAMD64.asm
@@ -12,7 +12,7 @@
 ; for the specific language governing rights and limitations under the
 ; License.
 ;
-; The Initial Developer of the Original e is blindtiger.
+; The Initial Developer of the Original Code is blindtiger.
 ;
 ;
 
diff --git a/Projects/Shark/AMD64/ContextAMD64.asm b/Projects/Shark/AMD64/ContextAMD64.asm
index de63855..3d004be 100644
--- a/Projects/Shark/AMD64/ContextAMD64.asm
+++ b/Projects/Shark/AMD64/ContextAMD64.asm
@@ -12,7 +12,7 @@
 ; for the specific language governing rights and limitations under the
 ; License.
 ;
-; The Initial Developer of the Original e is blindtiger.
+; The Initial Developer of the Original Code is blindtiger.
 ;
 ;
 
diff --git a/Projects/Shark/AMD64/PatchGuardAMD64.c b/Projects/Shark/AMD64/PatchGuardAMD64.c
index b5d4b2d..fc3dfbf 100644
--- a/Projects/Shark/AMD64/PatchGuardAMD64.c
+++ b/Projects/Shark/AMD64/PatchGuardAMD64.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
@@ -501,14 +501,14 @@ InitializePgBlock(
     };
 
     cptr ClearMessage[3] = {
-        "[SHARK] < %p > declassified context cleared\n",
-        "[SHARK] < %p > encrypted context cleared\n",
-        "[SHARK] < %p > double encrypted context cleared\n"
+        "[Shark] < %p > declassified context cleared\n",
+        "[Shark] < %p > encrypted context cleared\n",
+        "[Shark] < %p > double encrypted context cleared\n"
     };
 
 #ifdef DEBUG
     vDbgPrint(
-        "[SHARK] < %p > PgBlock\n",
+        "[Shark] < %p > PgBlock\n",
         PgBlock);
 #endif // DEBUG
 
@@ -588,7 +588,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > SizeCmpAppendDllSection\n",
+                                        "[Shark] < %p > SizeCmpAppendDllSection\n",
                                         PgBlock->SizeCmpAppendDllSection);
 #endif // DEBUG
 
@@ -600,7 +600,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                         vDbgPrint(
-                                            "[SHARK] < %p > BtcEnable\n",
+                                            "[Shark] < %p > BtcEnable\n",
                                             PgBlock->BtcEnable);
 #endif // DEBUG
                                     }
@@ -621,7 +621,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > OriginalCmpAppendDllSection\n",
+                                        "[Shark] < %p > OriginalCmpAppendDllSection\n",
                                         PgBlock->OriginalCmpAppendDllSection);
 #endif // DEBUG
                                 }
@@ -635,7 +635,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                 vDbgPrint(
-                                    "[SHARK] < %p > OffsetEntryPoint\n",
+                                    "[Shark] < %p > OffsetEntryPoint\n",
                                     PgBlock->OffsetEntryPoint);
 #endif // DEBUG
                                 break;
@@ -680,7 +680,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                         vDbgPrint(
-                            "[SHARK] < %p > SizeINITKDBG\n",
+                            "[Shark] < %p > SizeINITKDBG\n",
                             PgBlock->SizeINITKDBG);
 #endif // DEBUG
 
@@ -693,7 +693,7 @@ InitializePgBlock(
                                 PgBlock->SizeINITKDBG);
 #ifdef DEBUG
                             vDbgPrint(
-                                "[SHARK] < %p > INITKDBG\n",
+                                "[Shark] < %p > INITKDBG\n",
                                 PgBlock->INITKDBG);
 #endif // DEBUG
                         }
@@ -720,7 +720,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                             FindAndPrintSymbol(
-                                "[SHARK]",
+                                "[Shark]",
                                 (ptr)PgBlock->Fields[0]);
 #endif // DEBUG
 
@@ -729,7 +729,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                             FindAndPrintSymbol(
-                                "[SHARK]",
+                                "[Shark]",
                                 (ptr)PgBlock->Fields[1]);
 #endif // DEBUG
 
@@ -738,7 +738,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                             FindAndPrintSymbol(
-                                "[SHARK]",
+                                "[Shark]",
                                 (ptr)PgBlock->Fields[2]);
 #endif // DEBUG
 
@@ -747,7 +747,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                             FindAndPrintSymbol(
-                                "[SHARK]",
+                                "[Shark]",
                                 (ptr)PgBlock->Fields[3]);
 #endif // DEBUG
 
@@ -773,7 +773,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                             vDbgPrint(
-                                                "[SHARK] < %p > MmAllocateIndependentPages\n",
+                                                "[Shark] < %p > MmAllocateIndependentPages\n",
                                                 PgBlock->MmAllocateIndependentPages);
 #endif // DEBUG
                                         }
@@ -787,7 +787,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                         vDbgPrint(
-                                            "[SHARK] < %p > MmFreeIndependentPages\n",
+                                            "[Shark] < %p > MmFreeIndependentPages\n",
                                             PgBlock->MmFreeIndependentPages);
 #endif // DEBUG
 
@@ -800,7 +800,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                         vDbgPrint(
-                                            "[SHARK] < %p > MmSetPageProtection\n",
+                                            "[Shark] < %p > MmSetPageProtection\n",
                                             PgBlock->MmSetPageProtection);
 #endif // DEBUG
 
@@ -830,7 +830,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > PsInvertedFunctionTable\n",
+                                        "[Shark] < %p > PsInvertedFunctionTable\n",
                                         GetGpBlock(PgBlock)->PsInvertedFunctionTable);
 #endif // DEBUG
 
@@ -851,7 +851,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > BranchKey[10]\n",
+                                        "[Shark] < %p > BranchKey[10]\n",
                                         PgBlock->BranchKey[10]);
 #endif // DEBUG
                                 }
@@ -869,7 +869,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > BranchKey[0]\n",
+                                        "[Shark] < %p > BranchKey[0]\n",
                                         PgBlock->BranchKey[0]);
 #endif // DEBUG
 
@@ -878,7 +878,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > BranchKey[1]\n",
+                                        "[Shark] < %p > BranchKey[1]\n",
                                         PgBlock->BranchKey[1]);
 #endif // DEBUG
 
@@ -887,7 +887,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > BranchKey[2]\n",
+                                        "[Shark] < %p > BranchKey[2]\n",
                                         PgBlock->BranchKey[2]);
 #endif // DEBUG
 
@@ -896,7 +896,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > BranchKey[3]\n",
+                                        "[Shark] < %p > BranchKey[3]\n",
                                         PgBlock->BranchKey[3]);
 #endif // DEBUG
 
@@ -904,7 +904,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > BranchKey[4]\n",
+                                        "[Shark] < %p > BranchKey[4]\n",
                                         PgBlock->BranchKey[4]);
 #endif // DEBUG
 
@@ -913,7 +913,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > BranchKey[5]\n",
+                                        "[Shark] < %p > BranchKey[5]\n",
                                         PgBlock->BranchKey[5]);
 #endif // DEBUG
 
@@ -925,7 +925,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > BranchKey[6]\n",
+                                        "[Shark] < %p > BranchKey[6]\n",
                                         PgBlock->BranchKey[6]);
 #endif // DEBUG
 
@@ -934,7 +934,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > BranchKey[7]\n",
+                                        "[Shark] < %p > BranchKey[7]\n",
                                         PgBlock->BranchKey[7]);
 #endif // DEBUG
 
@@ -943,7 +943,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > BranchKey[8]\n",
+                                        "[Shark] < %p > BranchKey[8]\n",
                                         PgBlock->BranchKey[8]);
 #endif // DEBUG
 
@@ -952,7 +952,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > BranchKey[9]\n",
+                                        "[Shark] < %p > BranchKey[9]\n",
                                         PgBlock->BranchKey[9]);
 #endif // DEBUG
                                 }
@@ -967,7 +967,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > BranchKey[11]\n",
+                                        "[Shark] < %p > BranchKey[11]\n",
                                         PgBlock->BranchKey[11]);
 #endif // DEBUG
                                 }
@@ -995,7 +995,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                     vDbgPrint(
-                        "[SHARK] < %p > KiStartSystemThread\n",
+                        "[Shark] < %p > KiStartSystemThread\n",
                         PgBlock->KiStartSystemThread);
 #endif // DEBUG
                 }
@@ -1020,7 +1020,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                         vDbgPrint(
-                            "[SHARK] < %p > PspSystemThreadStartup\n",
+                            "[Shark] < %p > PspSystemThreadStartup\n",
                             PgBlock->PspSystemThreadStartup);
 #endif // DEBUG
                     }
@@ -1060,7 +1060,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                 vDbgPrint(
-                                    "[SHARK] < %p > KiWaitNever\n",
+                                    "[Shark] < %p > KiWaitNever\n",
                                     PgBlock->KiWaitNever);
 #endif // DEBUG
                             }
@@ -1069,7 +1069,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                                 vDbgPrint(
-                                    "[SHARK] < %p > KiWaitAlways\n",
+                                    "[Shark] < %p > KiWaitAlways\n",
                                     PgBlock->KiWaitAlways);
 #endif // DEBUG
 
@@ -1090,7 +1090,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
     vDbgPrint(
-        "[SHARK] < %p > MmIsNonPagedSystemAddressValid\n",
+        "[Shark] < %p > MmIsNonPagedSystemAddressValid\n",
         PgBlock->Pool.MmIsNonPagedSystemAddressValid);
 #endif // DEBUG
 
@@ -1124,7 +1124,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                 vDbgPrint(
-                    "[SHARK] < %p > MiGetSystemRegionType\n",
+                    "[Shark] < %p > MiGetSystemRegionType\n",
                     PgBlock->MiGetSystemRegionType);
 #endif // DEBUG
             }
@@ -1163,7 +1163,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
             vDbgPrint(
-                "[SHARK] < %p > PoolBigPageTable\n",
+                "[Shark] < %p > PoolBigPageTable\n",
                 PgBlock->Pool.PoolBigPageTable);
 #endif // DEBUG
 
@@ -1174,7 +1174,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
             vDbgPrint(
-                "[SHARK] < %p > PoolBigPageTableSize\n",
+                "[Shark] < %p > PoolBigPageTableSize\n",
                 PgBlock->Pool.PoolBigPageTableSize);
 #endif // DEBUG
         }
@@ -1214,7 +1214,7 @@ InitializePgBlock(
                     PgBlock->SystemPtes.NumberOfPtes = BitMap->SizeOfBitMap * 8;
 #ifdef DEBUG
                     vDbgPrint(
-                        "[SHARK] < %p > NumberOfPtes\n",
+                        "[Shark] < %p > NumberOfPtes\n",
                         PgBlock->SystemPtes.NumberOfPtes);
 #endif // DEBUG
 
@@ -1228,7 +1228,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
                     vDbgPrint(
-                        "[SHARK] < %p > BasePte\n",
+                        "[Shark] < %p > BasePte\n",
                         PgBlock->SystemPtes.BasePte);
 #endif // DEBUG
 
@@ -1298,7 +1298,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
     vDbgPrint(
-        "[SHARK] < %p > RtlLookupFunctionEntry\n",
+        "[Shark] < %p > RtlLookupFunctionEntry\n",
         PgBlock->RtlLookupFunctionEntry);
 #endif // DEBUG
 
@@ -1308,7 +1308,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
     vDbgPrint(
-        "[SHARK] < %p > RtlVirtualUnwind\n",
+        "[Shark] < %p > RtlVirtualUnwind\n",
         PgBlock->RtlVirtualUnwind);
 #endif // DEBUG
 
@@ -1318,7 +1318,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
     vDbgPrint(
-        "[SHARK] < %p > ExQueueWorkItem\n",
+        "[Shark] < %p > ExQueueWorkItem\n",
         PgBlock->ExQueueWorkItem);
 #endif // DEBUG
 
@@ -1334,7 +1334,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
     vDbgPrint(
-        "[SHARK] < %p > CaptureContext\n",
+        "[Shark] < %p > CaptureContext\n",
         PgBlock->CaptureContext);
 #endif // DEBUG
 
@@ -1380,7 +1380,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
     vDbgPrint(
-        "[SHARK] < %p > FreeWorker\n",
+        "[Shark] < %p > FreeWorker\n",
         PgBlock->FreeWorker);
 #endif // DEBUG
 
@@ -1396,7 +1396,7 @@ InitializePgBlock(
 
 #ifdef DEBUG
     vDbgPrint(
-        "[SHARK] < %p > ClearCallback\n",
+        "[Shark] < %p > ClearCallback\n",
         PgBlock->ClearCallback);
 #endif // DEBUG
 }
@@ -1446,96 +1446,94 @@ PgCreateObject(
 void
 NTAPI
 PgSetNewEntry(
-    __inout PPGBLOCK PgBlock,
-    __in PPGOBJECT Object,
-    __in ptr PatchGuardContext,
-    __in u64 RorKey
+__inout PPGBLOCK PgBlock,
+__in PPGOBJECT Object,
+__in ptr PatchGuardContext,
+__in u64 RorKey
 )
 {
-    u64 LastRorKey = 0;
-    u32 RvaOfEntry = 0;
-    u64 FieldBuffer[PG_COMPARE_FIELDS_COUNT] = { 0 };
-    u32 FieldIndex = 0;
-    u32 Index = 0;
-    ptr Pointer = NULL;
+	u64 LastRorKey = 0;
+	u32 RvaOfEntry = 0;
+	u64 FieldBuffer[PG_COMPARE_FIELDS_COUNT] = { 0 };
+	u32 FieldIndex = 0;
+	u32 Index = 0;
+	ptr Pointer = NULL;
 
-    // xor code must be align 8 byte;
-    // get PatchGuard entry offset in encrypted code
+	// xor code must be align 8 byte;
+	// get PatchGuard entry offset in encrypted code
 
-    FieldIndex = (PgBlock->OffsetEntryPoint -
-        PgBlock->SizeCmpAppendDllSection) / sizeof(u64);
+	FieldIndex = (PgBlock->OffsetEntryPoint -
+		PgBlock->SizeCmpAppendDllSection) / sizeof(u64);
 
-    RtlCopyMemory(
-        FieldBuffer,
-        (u8ptr)PatchGuardContext + ALIGN_DOWN(PgBlock->OffsetEntryPoint, u),
-        sizeof(FieldBuffer));
+	RtlCopyMemory(
+		FieldBuffer,
+		(u8ptr)PatchGuardContext + (PgBlock->OffsetEntryPoint & ~7),
+		sizeof(FieldBuffer));
 
-    LastRorKey = RorKey;
+	LastRorKey = RorKey;
 
-    for (Index = 0;
-        Index < FieldIndex;
-        Index++) {
-        LastRorKey = PgBlock->Rol64(LastRorKey, Index);
-    }
+	for (Index = 0;
+		Index < FieldIndex;
+		Index++) {
+		LastRorKey = PgBlock->Rol64(LastRorKey, Index);
+	}
 
-    for (Index = 0;
-        Index < RTL_NUMBER_OF(FieldBuffer);
-        Index++) {
-        LastRorKey = PgBlock->Rol64(LastRorKey, FieldIndex + Index);
-        FieldBuffer[Index] = FieldBuffer[Index] ^ LastRorKey;
-    }
+	for (Index = 0;
+		Index < RTL_NUMBER_OF(FieldBuffer);
+		Index++) {
+		LastRorKey = PgBlock->Rol64(LastRorKey, FieldIndex + Index);
+		FieldBuffer[Index] = FieldBuffer[Index] ^ LastRorKey;
+	}
 
-    RvaOfEntry =
-        *(u32ptr)((u8ptr)FieldBuffer
-            + ALIGN_DOWN(PgBlock->OffsetEntryPoint, u));
+	RvaOfEntry = *(u32ptr)((u8ptr)FieldBuffer + (PgBlock->OffsetEntryPoint & 7));
 
-    // copy PatchGuard entry head code to temp bufer and decode
+	// copy PatchGuard entry head code to temp bufer and decode
 
-    FieldIndex = (RvaOfEntry - PgBlock->SizeCmpAppendDllSection) / sizeof(u64);
+	FieldIndex = (RvaOfEntry - PgBlock->SizeCmpAppendDllSection) / sizeof(u64);
 
-    RtlCopyMemory(
-        FieldBuffer,
-        (u8ptr)PatchGuardContext + ALIGN_DOWN(RvaOfEntry, u),
-        sizeof(FieldBuffer));
+	RtlCopyMemory(
+		FieldBuffer,
+		(u8ptr)PatchGuardContext + (RvaOfEntry & ~7),
+		sizeof(FieldBuffer));
 
-    LastRorKey = RorKey;
+	LastRorKey = RorKey;
 
-    for (Index = 0;
-        Index < FieldIndex;
-        Index++) {
-        LastRorKey = PgBlock->Rol64(LastRorKey, Index);
-    }
+	for (Index = 0;
+		Index < FieldIndex;
+		Index++) {
+		LastRorKey = PgBlock->Rol64(LastRorKey, Index);
+	}
 
-    for (Index = 0;
-        Index < RTL_NUMBER_OF(FieldBuffer);
-        Index++) {
-        LastRorKey = PgBlock->Rol64(LastRorKey, FieldIndex + Index);
-        FieldBuffer[Index] = FieldBuffer[Index] ^ LastRorKey;
-    }
+	for (Index = 0;
+		Index < RTL_NUMBER_OF(FieldBuffer);
+		Index++) {
+		LastRorKey = PgBlock->Rol64(LastRorKey, FieldIndex + Index);
+		FieldBuffer[Index] = FieldBuffer[Index] ^ LastRorKey;
+	}
 
-    // set temp buffer PatchGuard entry head jmp to PgClearCallback and encrypt
+	// set temp buffer PatchGuard entry head jmp to PgClearCallback and encrypt
 
-    Pointer = (u8ptr)FieldBuffer + ALIGN_DOWN(RvaOfEntry, u);
+	Pointer = (u8ptr)FieldBuffer + (RvaOfEntry & 7);
 
-    BuildJumpCode(&Pointer, &Object->Body);
+	LockedBuildJumpCode(&Pointer, &Object->Body);
 
-    while (Index--) {
-        FieldBuffer[Index] = FieldBuffer[Index] ^ LastRorKey;
-        LastRorKey = PgBlock->Ror64(LastRorKey, FieldIndex + Index);
-    }
+	while (Index--) {
+		FieldBuffer[Index] = FieldBuffer[Index] ^ LastRorKey;
+		LastRorKey = PgBlock->Ror64(LastRorKey, FieldIndex + Index);
+	}
 
-    // copy temp buffer PatchGuard entry head to old address, 
-    // when PatchGuard code decrypt self jmp PgClearCallback.
+	// copy temp buffer PatchGuard entry head to old address, 
+	// when PatchGuard code decrypt self jmp PgClearCallback.
 
-    RtlCopyMemory(
-        (u8ptr)PatchGuardContext + ALIGN_DOWN(RvaOfEntry, u),
-        FieldBuffer,
-        sizeof(FieldBuffer));
+	RtlCopyMemory(
+		(u8ptr)PatchGuardContext + (RvaOfEntry & ~7),
+		FieldBuffer,
+		sizeof(FieldBuffer));
 
 #ifdef DEBUG
-    vDbgPrint(
-        "[SHARK] < %p > set new entry for encrypted context\n",
-        Object);
+	vDbgPrint(
+		"[Shark] < %p > set new entry for encrypted context\n",
+		Object);
 #endif // DEBUG
 }
 
@@ -1614,7 +1612,7 @@ PgSetNewEntryWithBtc(
     if (0 == Index) {
 #ifdef DEBUG
         vDbgPrint(
-            "[SHARK] < %p > entrypoint not found!\n",
+            "[Shark] < %p > entrypoint not found!\n",
             Object);
 #endif // DEBUG
     }
@@ -1639,7 +1637,7 @@ PgSetNewEntryWithBtc(
 
         Pointer = (PGUARD_BODY)((u8ptr)FieldBuffer + sizeof(u) - AlignOffset);
 
-        BuildJumpCode(&Pointer, &Object->Body);
+		LockedBuildJumpCode(&Pointer, &Object->Body);
 
         RorKey = LastRorKey;
         Index = LastRorKeyOffset;
@@ -1656,7 +1654,7 @@ PgSetNewEntryWithBtc(
 
 #ifdef DEBUG
         vDbgPrint(
-            "[SHARK] < %p > set new entry for btc encrypted context\n",
+            "[Shark] < %p > set new entry for btc encrypted context\n",
             Object);
 #endif // DEBUG
     }
@@ -1880,14 +1878,14 @@ PgSetTimerNewEntry(
 
     Pointer = &Object->Context[2];
 
-    BuildJumpCode(&Pointer, &Object->Body);
+	LockedBuildJumpCode(&Pointer, &Object->Body);
 
     Object->Context[2] ^= Object->Key;
     Object->Context[3] ^= Object->Key;
 
 #ifdef DEBUG
     vDbgPrint(
-        "[SHARK] < %p > set new entry for double encrypted context\n",
+        "[Shark] < %p > set new entry for double encrypted context\n",
         Object);
 #endif // DEBUG
 
@@ -2017,14 +2015,14 @@ PgSetBranchNewEntry(
 
     Pointer = &Object->Context[2];
 
-    BuildJumpCode(&Pointer, &Object->Body);
+	LockedBuildJumpCode(&Pointer, &Object->Body);
 
     Object->Context[2] ^= Object->Key;
     Object->Context[3] ^= Object->Key;
 
 #ifdef DEBUG
     vDbgPrint(
-        "[SHARK] < %p > set new entry for double encrypted context\n",
+        "[Shark] < %p > set new entry for double encrypted context\n",
         Object);
 #endif // DEBUG
 
@@ -2211,7 +2209,7 @@ PgCompareFields(
                 if (NULL != Object) {
 #ifdef DEBUG
                     vDbgPrint(
-                        "[SHARK] < %p > found encrypted context < %p - %08x >\n",
+                        "[Shark] < %p > found encrypted context < %p - %08x >\n",
                         Object->Context,
                         BaseAddress,
                         RegionSize);
@@ -2250,7 +2248,7 @@ PgCompareFields(
 
 #ifdef DEBUG
                             vDbgPrint(
-                                "[SHARK] < %p > found declassified context\n",
+                                "[Shark] < %p > found declassified context\n",
                                 Context);
 #endif // DEBUG
                             break;
@@ -2280,7 +2278,7 @@ PgCompareFields(
 
 #ifdef DEBUG
                                     vDbgPrint(
-                                        "[SHARK] < %p > found encrypted context < %p - %08x >\n",
+                                        "[Shark] < %p > found encrypted context < %p - %08x >\n",
                                         Context,
                                         BaseAddress,
                                         RegionSize);
@@ -2319,7 +2317,7 @@ PgCompareFields(
 
 #ifdef DEBUG
                                             vDbgPrint(
-                                                "[SHARK] < %p > first rorkey\n",
+                                                "[Shark] < %p > first rorkey\n",
                                                 RorKey);
 #endif // DEBUG
                                             PgSetNewEntry(PgBlock, Object, Context, RorKey);
@@ -2465,7 +2463,7 @@ PgClearSystemPtesEncryptedContext(
 #ifdef DEBUG
     if (0 == PgBlock->Repeat) {
         vDbgPrint(
-            "[SHARK] < %p > SystemPtes < %p - %p >\n",
+            "[Shark] < %p > SystemPtes < %p - %p >\n",
             KeGetCurrentProcessorNumber(),
             PgBlock->SystemPtes.BasePte,
             PgBlock->SystemPtes.BasePte + NumberOfPtes);
@@ -2506,9 +2504,10 @@ PgClearSystemPtesEncryptedContext(
 
                 if (StartingRunIndex -
                     HintIndex >= BYTES_TO_PAGES(PgBlock->SizeINITKDBG)) {
+					/*
 #ifdef DEBUG
                     vDbgPrint(
-                        "[SHARK] < %p > scan < %p - %08x > < %p, %p, %p, %p, ...>\n",
+                        "[Shark] < %p > scan < %p - %08x > < %p, %p, %p, %p...>\n",
                         KeGetCurrentProcessorNumber(),
                         GetVaMappedByPte(PgBlock->SystemPtes.BasePte + HintIndex),
                         (StartingRunIndex - HintIndex) * PAGE_SIZE,
@@ -2517,6 +2516,7 @@ PgClearSystemPtesEncryptedContext(
                         __rduptr(__ptou(GetVaMappedByPte(PgBlock->SystemPtes.BasePte + HintIndex)) + 0x10),
                         __rduptr(__ptou(GetVaMappedByPte(PgBlock->SystemPtes.BasePte + HintIndex)) + 0x18));
 #endif // DEBUG
+					*/
 
                     PgCompareFields(
                         PgBlock,
@@ -2553,7 +2553,7 @@ PgClearPoolEncryptedContext(
 #ifdef DEBUG
     if (0 == PgBlock->Repeat) {
         vDbgPrint(
-            "[SHARK] < %p > BigPool < %p - %08x >\n",
+            "[Shark] < %p > BigPool < %p - %08x >\n",
             KeGetCurrentProcessorNumber(),
             *PgBlock->Pool.PoolBigPageTable,
             *PgBlock->Pool.PoolBigPageTableSize);
@@ -2590,9 +2590,10 @@ PgClearPoolEncryptedContext(
                         }
                     }
 
+					/*
 #ifdef DEBUG
                     vDbgPrint(
-                        "[SHARK] < %p > scan < %p - %08x > < %p, %p, %p, %p, ...>\n",
+                        "[Shark] < %p > scan < %p - %08x > < %p, %p, %p, %p...>\n",
                         KeGetCurrentProcessorNumber(),
                         PAGE_ALIGN(PoolBigPage->Va),
                         PoolBigPage->NumberOfPages,
@@ -2601,6 +2602,7 @@ PgClearPoolEncryptedContext(
                         __rduptr(__ptou(PAGE_ALIGN(PoolBigPage->Va)) + 0x10),
                         __rduptr(__ptou(PAGE_ALIGN(PoolBigPage->Va)) + 0x18));
 #endif // DEBUG
+					*/
 
                     PgCompareFields(
                         PgBlock,
@@ -2651,7 +2653,7 @@ PgLocatePoolObject(
 
 #ifdef DEBUG
                         GetGpBlock(PgBlock)->vDbgPrint(
-                            "[SHARK] < %p > found region in pool < %p - %08x >\n",
+                            "[Shark] < %p > found region in pool < %p - %08x >\n",
                             Establisher,
                             Object->BaseAddress,
                             Object->RegionSize);
@@ -2740,7 +2742,7 @@ PgLocateSystemPtesObject(
                     }
 #ifdef DEBUG
                     vDbgPrint(
-                        "[SHARK] < %p > found region in system ptes < %p - %08x >\n",
+                        "[Shark] < %p > found region in system ptes < %p - %08x >\n",
                         Establisher,
                         Object->BaseAddress,
                         Object->RegionSize);
@@ -2914,7 +2916,7 @@ PgCheckAllWorkerThread(
                             if (0 != Context->ContextRecord.Rip) {
 #ifdef DEBUG
                                 vDbgPrint(
-                                    "[SHARK] < %p > found noimage return address in worker thread stack\n",
+                                    "[Shark] < %p > found noimage return address in worker thread stack\n",
                                     Context->ContextRecord.Rip);
 #endif // DEBUG
 
@@ -2954,7 +2956,7 @@ PgCheckAllWorkerThread(
 
 #ifdef DEBUG
                                                 vDbgPrint(
-                                                    "[SHARK] < %p > insert worker thread check code\n",
+                                                    "[Shark] < %p > insert worker thread check code\n",
                                                     Object);
 #endif // DEBUG
                                             }
@@ -3091,7 +3093,7 @@ PgClearWorker(
 
 #ifdef DEBUG
                             vDbgPrint(
-                                "[SHARK] < %p > OffsetSameThreadPassive\n",
+                                "[Shark] < %p > OffsetSameThreadPassive\n",
                                 Context->PgBlock->OffsetSameThreadPassive);
 #endif // DEBUG
 
@@ -3122,15 +3124,15 @@ PgClearWorker(
             NULL == Context->PgBlock->SystemPtes.BasePte ||
             NULL == Context->PgBlock->MmAllocateIndependentPages ||
             NULL == Context->PgBlock->MmFreeIndependentPages ||
-            NULL == Context->PgBlock->MmSetPageProtection ||
-            NULL == Context->PgBlock->KiWaitNever ||
-            NULL == Context->PgBlock->KiWaitAlways) {
+            NULL == Context->PgBlock->MmSetPageProtection) {
             Chance = FALSE;
         }
     }
 
     if (GetGpBlock(Context->PgBlock)->BuildNumber >= 9600) {
-        if (0 == Context->PgBlock->WorkerContext) {
+		if (0 == Context->PgBlock->WorkerContext ||
+			NULL == Context->PgBlock->KiWaitNever ||
+			NULL == Context->PgBlock->KiWaitAlways) {
             Chance = FALSE;
         }
     }
diff --git a/Projects/Shark/AMD64/SpaceAMD64.c b/Projects/Shark/AMD64/SpaceAMD64.c
index 263c044..4c25db4 100644
--- a/Projects/Shark/AMD64/SpaceAMD64.c
+++ b/Projects/Shark/AMD64/SpaceAMD64.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/AMD64/StackAMD64.c b/Projects/Shark/AMD64/StackAMD64.c
index 4b695b9..0e899f9 100644
--- a/Projects/Shark/AMD64/StackAMD64.c
+++ b/Projects/Shark/AMD64/StackAMD64.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Ctx.c b/Projects/Shark/Ctx.c
index ccf8355..e620fb9 100644
--- a/Projects/Shark/Ctx.c
+++ b/Projects/Shark/Ctx.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Ctx.h b/Projects/Shark/Ctx.h
index 965b14f..9d360a4 100644
--- a/Projects/Shark/Ctx.h
+++ b/Projects/Shark/Ctx.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Except.c b/Projects/Shark/Except.c
index c736323..9cd4694 100644
--- a/Projects/Shark/Except.c
+++ b/Projects/Shark/Except.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Except.h b/Projects/Shark/Except.h
index 7b2833e..8eac962 100644
--- a/Projects/Shark/Except.h
+++ b/Projects/Shark/Except.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Guard.c b/Projects/Shark/Guard.c
index 6d5d90e..d17784f 100644
--- a/Projects/Shark/Guard.c
+++ b/Projects/Shark/Guard.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Guard.h b/Projects/Shark/Guard.h
index b502e80..ad4e8a3 100644
--- a/Projects/Shark/Guard.h
+++ b/Projects/Shark/Guard.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/I386/CmpI386.asm b/Projects/Shark/I386/CmpI386.asm
index c808bf9..18f3ec8 100644
--- a/Projects/Shark/I386/CmpI386.asm
+++ b/Projects/Shark/I386/CmpI386.asm
@@ -12,7 +12,7 @@
 ; for the specific language governing rights and limitations under the
 ; License.
 ;
-; The Initial Developer of the Original e is blindtiger.
+; The Initial Developer of the Original Code is blindtiger.
 ;
 ;
 
diff --git a/Projects/Shark/I386/ContextI386.asm b/Projects/Shark/I386/ContextI386.asm
index da5add6..7a54409 100644
--- a/Projects/Shark/I386/ContextI386.asm
+++ b/Projects/Shark/I386/ContextI386.asm
@@ -12,7 +12,7 @@
 ; for the specific language governing rights and limitations under the
 ; License.
 ;
-; The Initial Developer of the Original e is blindtiger.
+; The Initial Developer of the Original Code is blindtiger.
 ;
 ;
 
diff --git a/Projects/Shark/I386/I386.asm b/Projects/Shark/I386/I386.asm
index 076674f..2c650a3 100644
--- a/Projects/Shark/I386/I386.asm
+++ b/Projects/Shark/I386/I386.asm
@@ -12,7 +12,7 @@
 ; for the specific language governing rights and limitations under the
 ; License.
 ;
-; The Initial Developer of the Original e is blindtiger.
+; The Initial Developer of the Original Code is blindtiger.
 ;
 ;
 
diff --git a/Projects/Shark/I386/PatchGuardI386.c b/Projects/Shark/I386/PatchGuardI386.c
index 60b6d93..4da630d 100644
--- a/Projects/Shark/I386/PatchGuardI386.c
+++ b/Projects/Shark/I386/PatchGuardI386.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/I386/SpaceI386.c b/Projects/Shark/I386/SpaceI386.c
index 95f838e..3cdce5d 100644
--- a/Projects/Shark/I386/SpaceI386.c
+++ b/Projects/Shark/I386/SpaceI386.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/I386/StackI386.c b/Projects/Shark/I386/StackI386.c
index 6c652bf..c967018 100644
--- a/Projects/Shark/I386/StackI386.c
+++ b/Projects/Shark/I386/StackI386.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Makefile b/Projects/Shark/Makefile
index db462c7..9d87e4b 100644
--- a/Projects/Shark/Makefile
+++ b/Projects/Shark/Makefile
@@ -12,7 +12,7 @@
 # for the specific language governing rights and limitations under the
 # License.
 #
-# The Initial Developer of the Original e is blindtiger.
+# The Initial Developer of the Original Code is blindtiger.
 #
 #
 
diff --git a/Projects/Shark/PatchGuard.c b/Projects/Shark/PatchGuard.c
index 54bc9b8..33554eb 100644
--- a/Projects/Shark/PatchGuard.c
+++ b/Projects/Shark/PatchGuard.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/PatchGuard.h b/Projects/Shark/PatchGuard.h
index a2a0bfe..4b2427e 100644
--- a/Projects/Shark/PatchGuard.h
+++ b/Projects/Shark/PatchGuard.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
@@ -96,13 +96,13 @@ extern "C" {
 
 #define GetGpBlock(pgb) (pgb->GpBlock)
 
-#define PG_MAXIMUM_CONTEXT_COUNT 0x00000003UI32 // ���ܴ��ڵ� Context �������
-#define PG_FIRST_FIELD_OFFSET 0x00000100UI32 // ����ʹ�õĵ�һ�� Context ��Աƫ��
-#define PG_CMP_APPEND_DLL_SECTION_END 0x000000c0UI32 // CmpAppendDllSection ����
-#define PG_COMPARE_FIELDS_COUNT 0x00000004UI32 // ����ʱ�Ƚϵ� Context ��Ա����
-#define PG_COMPARE_BYTE_COUNT 0x00000010UI32 // ���� Worker ʱ�Ƚϵ��ֽ�����
+#define PG_MAXIMUM_CONTEXT_COUNT 0x00000003UI32 // ���ܴ��ڵ� Context �������
+#define PG_FIRST_FIELD_OFFSET 0x00000100UI32 // ����ʹ�õĵ�һ�� Context ��Աƫ��
+#define PG_CMP_APPEND_DLL_SECTION_END 0x000000c0UI32 // CmpAppendDllSection ����
+#define PG_COMPARE_FIELDS_COUNT 0x00000004UI32 // ����ʱ�Ƚϵ� Context ��Ա����
+#define PG_COMPARE_BYTE_COUNT 0x00000010UI32 // ���� Worker ʱ�Ƚϵ��ֽ�����
 
-        // EntryPoint �����С ��������ͷ���Ĵ���Ƭ�� ( ��С���� =  max(2 * 8 + 7, sizeof(GUARD_BODY)) )
+        // EntryPoint �����С ��������ͷ���Ĵ���Ƭ�� ( ��С���� =  max(2 * 8 + 7, sizeof(GUARD_BODY)) )
 #define PG_MAXIMUM_EP_BUFFER_COUNT ((max(2 * 8 + 7, sizeof(GUARD_BODY)) + 7) & ~7)
 
 #define PG_FIELD_BITS \
diff --git a/Projects/Shark/Reload.c b/Projects/Shark/Reload.c
index 0ba73fe..9365c28 100644
--- a/Projects/Shark/Reload.c
+++ b/Projects/Shark/Reload.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Reload.h b/Projects/Shark/Reload.h
index 51ed140..8fd7215 100644
--- a/Projects/Shark/Reload.h
+++ b/Projects/Shark/Reload.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Rtx.c b/Projects/Shark/Rtx.c
index eb40cc8..a29dd6a 100644
--- a/Projects/Shark/Rtx.c
+++ b/Projects/Shark/Rtx.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Rtx.h b/Projects/Shark/Rtx.h
index 98fc82a..14e4a2b 100644
--- a/Projects/Shark/Rtx.h
+++ b/Projects/Shark/Rtx.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Scan.c b/Projects/Shark/Scan.c
index a97f13d..24c87e1 100644
--- a/Projects/Shark/Scan.c
+++ b/Projects/Shark/Scan.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Scan.h b/Projects/Shark/Scan.h
index 72c10d3..f211fd5 100644
--- a/Projects/Shark/Scan.h
+++ b/Projects/Shark/Scan.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Shark.c b/Projects/Shark/Shark.c
index 9378b8e..5f3fa7b 100644
--- a/Projects/Shark/Shark.c
+++ b/Projects/Shark/Shark.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Shark.def b/Projects/Shark/Shark.def
index 6d4f663..8989ec6 100644
--- a/Projects/Shark/Shark.def
+++ b/Projects/Shark/Shark.def
@@ -12,7 +12,7 @@
 ; for the specific language governing rights and limitations under the
 ; License.
 ;
-; The Initial Developer of the Original e is blindtiger.
+; The Initial Developer of the Original Code is blindtiger.
 ;
 ;
 
diff --git a/Projects/Shark/Shark.h b/Projects/Shark/Shark.h
index 7c16a3d..8380214 100644
--- a/Projects/Shark/Shark.h
+++ b/Projects/Shark/Shark.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Shark.rc b/Projects/Shark/Shark.rc
index d53d45a..98392c6 100644
--- a/Projects/Shark/Shark.rc
+++ b/Projects/Shark/Shark.rc
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Space.c b/Projects/Shark/Space.c
index 39aa05e..51de9e1 100644
--- a/Projects/Shark/Space.c
+++ b/Projects/Shark/Space.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Space.h b/Projects/Shark/Space.h
index 8a98b00..ce35882 100644
--- a/Projects/Shark/Space.h
+++ b/Projects/Shark/Space.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Stack.c b/Projects/Shark/Stack.c
index c48d288..8b692fb 100644
--- a/Projects/Shark/Stack.c
+++ b/Projects/Shark/Stack.c
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Projects/Shark/Stack.h b/Projects/Shark/Stack.h
index 079f626..5079a4b 100644
--- a/Projects/Shark/Stack.h
+++ b/Projects/Shark/Stack.h
@@ -12,7 +12,7 @@
 * for the specific language governing rights and limitations under the
 * License.
 *
-* The Initial Developer of the Original e is blindtiger.
+* The Initial Developer of the Original Code is blindtiger.
 *
 */
 
diff --git a/Push.ps1 b/Push.ps1
deleted file mode 100644
index 9256922..0000000
--- a/Push.ps1
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# Copyright (c) 2015 - 2021 by blindtiger. All rights reserved.
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 2.0 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. SEe the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original e is blindtiger.
-#
-#
-
-git add *
-$commit = Get-Date -Format 'yyyy-MM-dd-HH-mm-ss'
-git commit -m $commit
-git push -u GitHub master
-pause
\ No newline at end of file
diff --git a/Shark.v12.suo b/Shark.v12.suo
index 19e1d72..28761f3 100644
Binary files a/Shark.v12.suo and b/Shark.v12.suo differ
diff --git a/build.cmd b/build.cmd
index abecb52..98b295d 100644
--- a/build.cmd
+++ b/build.cmd
@@ -12,7 +12,7 @@
 @rem for the specific language governing rights and limitations under the
 @rem License.
 @rem 
-@rem The Initial Developer of the Original e is blindtiger.
+@rem The Initial Developer of the Original Code is blindtiger.
 @rem 
 @rem