diff --git a/README.md b/README.md
index c84fe8b..094e764 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
 cper-convert to-cper samples/cper-json-test-arm.json --out cper.dump
 cper-convert to-json cper.generated.dump
 ```
-Another tool bundled with this repository is `cper-generate`, which is another command line tool found in `bin/`. This allows you to generate psuedo-random valid CPER records with sections of specified types for testing purposes. An example use of the program is below:
+Another tool bundled with this repository is `cper-generate`, found in `bin/`. This allows you to generate pseudo-random valid CPER records with sections of specified types for testing purposes. An example use of the program is below:
 ```
 cper-generate --out cper.generated.dump --sections generic ia32x64
 ```
diff --git a/edk/BaseTypes.h b/edk/BaseTypes.h
index f0b1b97..f7a29de 100644
--- a/edk/BaseTypes.h
+++ b/edk/BaseTypes.h
@@ -1,3 +1,13 @@
+/** @file
+  Processor or Compiler specific defines for all supported processors.
+
+  This file is stand alone self consistent set of definitions.
+
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
 #ifndef CPER_BASETYPES_H
 #define CPER_BASETYPES_H
 
diff --git a/edk/Cper.c b/edk/Cper.c
index 0ccf08b..a772939 100644
--- a/edk/Cper.c
+++ b/edk/Cper.c
@@ -1,7 +1,17 @@
+/** @file
+  GUIDs and definitions used for Common Platform Error Record.
+
+  Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+  @par Revision Reference:
+  GUIDs defined in UEFI 2.7 Specification.
+
+**/
+
 /**
  * Extern definitions for EFI GUIDs relating to notification types and error section types.
- * 
- * Author: Lawrence.Tang@arm.com
  **/
 #include "Cper.h"
 
diff --git a/generator/cper-generate-cli.c b/generator/cper-generate-cli.c
index 7afc2aa..5d9c01e 100644
--- a/generator/cper-generate-cli.c
+++ b/generator/cper-generate-cli.c
@@ -1,5 +1,5 @@
 /**
- * A user-space application for generating psuedo-random specification compliant CPER records. 
+ * A user-space application for generating pseudo-random specification compliant CPER records. 
  * 
  * Author: Lawrence.Tang@arm.com
  **/
@@ -43,7 +43,7 @@
 void print_help()
 {
 	printf(":: --out cper.file --sections section1 [section2 section3 ...]\n");
-	printf("\tGenerates a psuedo-random CPER file with the provided section types and outputs to the given file name.\n");
+	printf("\tGenerates a pseudo-random CPER file with the provided section types and outputs to the given file name.\n");
 	printf("\tValid section type names are the following:\n");
 	printf("\t\t- generic\n");
 	printf("\t\t- ia32x64\n");
diff --git a/generator/cper-generate.c b/generator/cper-generate.c
index b1389b5..594bd90 100644
--- a/generator/cper-generate.c
+++ b/generator/cper-generate.c
@@ -1,5 +1,5 @@
 /**
- * Describes functions for generating psuedo-random specification compliant CPER records. 
+ * Describes functions for generating pseudo-random specification compliant CPER records. 
  * 
  * Author: Lawrence.Tang@arm.com
  **/
diff --git a/generator/gen-utils.c b/generator/gen-utils.c
index bce904a..c986b09 100644
--- a/generator/gen-utils.c
+++ b/generator/gen-utils.c
@@ -1,5 +1,5 @@
 /**
- * Utility functions to assist in generating psuedo-random CPER sections. 
+ * Utility functions to assist in generating pseudo-random CPER sections. 
  * 
  * Author: Lawrence.Tang@arm.com
  **/
diff --git a/generator/sections/gen-section-arm.c b/generator/sections/gen-section-arm.c
index bce04c5..040ad24 100644
--- a/generator/sections/gen-section-arm.c
+++ b/generator/sections/gen-section-arm.c
@@ -1,5 +1,5 @@
 /**
- * Functions for generating psuedo-random CPER ARM processor sections.
+ * Functions for generating pseudo-random CPER ARM processor sections.
  * 
  * Author: Lawrence.Tang@arm.com
  **/
@@ -14,7 +14,7 @@
 void* generate_arm_error_info();
 size_t generate_arm_context_info(void** location);
 
-//Generates a single psuedo-random ARM processor section, saving the resulting address to the given
+//Generates a single pseudo-random ARM processor section, saving the resulting address to the given
 //location. Returns the size of the newly created section.
 size_t generate_section_arm(void** location)
 {
diff --git a/generator/sections/gen-section-ccix-per.c b/generator/sections/gen-section-ccix-per.c
index 074fd0d..72bc1e0 100644
--- a/generator/sections/gen-section-ccix-per.c
+++ b/generator/sections/gen-section-ccix-per.c
@@ -1,5 +1,5 @@
 /**
- * Functions for generating psuedo-random CCIX PER error sections.
+ * Functions for generating pseudo-random CCIX PER error sections.
  * 
  * Author: Lawrence.Tang@arm.com
  **/
@@ -9,7 +9,7 @@
 #include "../gen-utils.h"
 #include "gen-sections.h"
 
-//Generates a single psuedo-random CCIX PER error section, saving the resulting address to the given
+//Generates a single pseudo-random CCIX PER error section, saving the resulting address to the given
 //location. Returns the size of the newly created section.
 size_t generate_section_ccix_per(void** location)
 {
diff --git a/generator/sections/gen-section-cxl-component.c b/generator/sections/gen-section-cxl-component.c
index d08dc90..2b8d18a 100644
--- a/generator/sections/gen-section-cxl-component.c
+++ b/generator/sections/gen-section-cxl-component.c
@@ -1,5 +1,5 @@
 /**
- * Functions for generating psuedo-random CXL component error sections.
+ * Functions for generating pseudo-random CXL component error sections.
  * 
  * Author: Lawrence.Tang@arm.com
  **/
@@ -9,7 +9,7 @@
 #include "../gen-utils.h"
 #include "gen-sections.h"
 
-//Generates a single psuedo-random CXL component error section, saving the resulting address to the given
+//Generates a single pseudo-random CXL component error section, saving the resulting address to the given
 //location. Returns the size of the newly created section.
 size_t generate_section_cxl_component(void** location)
 {
diff --git a/generator/sections/gen-section-cxl-protocol.c b/generator/sections/gen-section-cxl-protocol.c
index 85457ce..e0570b4 100644
--- a/generator/sections/gen-section-cxl-protocol.c
+++ b/generator/sections/gen-section-cxl-protocol.c
@@ -1,5 +1,5 @@
 /**
- * Functions for generating psuedo-random CXL protocol error sections.
+ * Functions for generating pseudo-random CXL protocol error sections.
  * 
  * Author: Lawrence.Tang@arm.com
  **/
@@ -9,7 +9,7 @@
 #include "../gen-utils.h"
 #include "gen-sections.h"
 
-//Generates a single psuedo-random CXL protocol error section, saving the resulting address to the given
+//Generates a single pseudo-random CXL protocol error section, saving the resulting address to the given
 //location. Returns the size of the newly created section.
 size_t generate_section_cxl_protocol(void** location)
 {
diff --git a/generator/sections/gen-section-dmar.c b/generator/sections/gen-section-dmar.c
index cb732cc..91da101 100644
--- a/generator/sections/gen-section-dmar.c
+++ b/generator/sections/gen-section-dmar.c
@@ -1,5 +1,5 @@
 /**
- * Functions for generating psuedo-random CPER DMAr error sections.
+ * Functions for generating pseudo-random CPER DMAr error sections.
  * 
  * Author: Lawrence.Tang@arm.com
  **/
@@ -9,7 +9,7 @@
 #include "../gen-utils.h"
 #include "gen-sections.h"
 
-//Generates a single psuedo-random generic DMAr error section, saving the resulting address to the given
+//Generates a single pseudo-random generic DMAr error section, saving the resulting address to the given
 //location. Returns the size of the newly created section.
 size_t generate_section_dmar_generic(void** location)
 {
@@ -33,7 +33,7 @@
     return size;
 }
 
-//Generates a single psuedo-random VT-d DMAr error section, saving the resulting address to the given
+//Generates a single pseudo-random VT-d DMAr error section, saving the resulting address to the given
 //location. Returns the size of the newly created section.
 size_t generate_section_dmar_vtd(void** location)
 {
@@ -56,7 +56,7 @@
     return size;
 }
 
-//Generates a single psuedo-random IOMMU DMAr error section, saving the resulting address to the given
+//Generates a single pseudo-random IOMMU DMAr error section, saving the resulting address to the given
 //location. Returns the size of the newly created section.
 size_t generate_section_dmar_iommu(void** location)
 {
diff --git a/generator/sections/gen-section-firmware.c b/generator/sections/gen-section-firmware.c
index 5b39fa1..7b47e54 100644
--- a/generator/sections/gen-section-firmware.c
+++ b/generator/sections/gen-section-firmware.c
@@ -1,5 +1,5 @@
 /**
- * Functions for generating psuedo-random CPER firmware error sections.
+ * Functions for generating pseudo-random CPER firmware error sections.
  * 
  * Author: Lawrence.Tang@arm.com
  **/
@@ -9,7 +9,7 @@
 #include "../gen-utils.h"
 #include "gen-sections.h"
 
-//Generates a single psuedo-random firmware error section, saving the resulting address to the given
+//Generates a single pseudo-random firmware error section, saving the resulting address to the given
 //location. Returns the size of the newly created section.
 size_t generate_section_firmware(void** location)
 {
diff --git a/generator/sections/gen-section-generic.c b/generator/sections/gen-section-generic.c
index abc9792..618f9b3 100644
--- a/generator/sections/gen-section-generic.c
+++ b/generator/sections/gen-section-generic.c
@@ -1,5 +1,5 @@
 /**
- * Functions for generating psuedo-random CPER generic processor sections.
+ * Functions for generating pseudo-random CPER generic processor sections.
  * 
  * Author: Lawrence.Tang@arm.com
  **/
@@ -9,7 +9,7 @@
 #include "../gen-utils.h"
 #include "gen-sections.h"
 
-//Generates a single psuedo-random generic processor section, saving the resulting address to the given
+//Generates a single pseudo-random generic processor section, saving the resulting address to the given
 //location. Returns the size of the newly created section.
 size_t generate_section_generic(void** location)
 {
diff --git a/generator/sections/gen-section-ia32x64.c b/generator/sections/gen-section-ia32x64.c
index a4470a8..a78bfcb 100644
--- a/generator/sections/gen-section-ia32x64.c
+++ b/generator/sections/gen-section-ia32x64.c
@@ -1,5 +1,5 @@
 /**
- * Functions for generating psuedo-random CPER IA32/x64 sections.
+ * Functions for generating pseudo-random CPER IA32/x64 sections.
  * 
  * Author: Lawrence.Tang@arm.com
  **/
@@ -14,7 +14,7 @@
 void* generate_ia32x64_error_structure();
 size_t generate_ia32x64_context_structure(void** location);
 
-//Generates a single psuedo-random IA32/x64 section, saving the resulting address to the given
+//Generates a single pseudo-random IA32/x64 section, saving the resulting address to the given
 //location. Returns the size of the newly created section.
 size_t generate_section_ia32x64(void** location)
 {
diff --git a/generator/sections/gen-section-memory.c b/generator/sections/gen-section-memory.c
index dfa713f..63621da 100644
--- a/generator/sections/gen-section-memory.c
+++ b/generator/sections/gen-section-memory.c
@@ -1,5 +1,5 @@
 /**
- * Functions for generating psuedo-random CPER platform memory error sections.
+ * Functions for generating pseudo-random CPER platform memory error sections.
  * 
  * Author: Lawrence.Tang@arm.com
  **/
@@ -9,7 +9,7 @@
 #include "../gen-utils.h"
 #include "gen-sections.h"
 
-//Generates a single psuedo-random platform memory error section, saving the resulting address to the given
+//Generates a single pseudo-random platform memory error section, saving the resulting address to the given
 //location. Returns the size of the newly created section.
 size_t generate_section_memory(void** location)
 {
@@ -33,7 +33,7 @@
     return size;
 }
 
-//Generates a single psuedo-random memory 2 error section, saving the resulting address to the given
+//Generates a single pseudo-random memory 2 error section, saving the resulting address to the given
 //location. Returns the size of the newly created section.
 size_t generate_section_memory2(void** location)
 {
diff --git a/generator/sections/gen-section-pci-bus.c b/generator/sections/gen-section-pci-bus.c
index cbe5b81..406a27e 100644
--- a/generator/sections/gen-section-pci-bus.c
+++ b/generator/sections/gen-section-pci-bus.c
@@ -1,5 +1,5 @@
 /**
- * Functions for generating psuedo-random CPER PCI/PCI-X bus error sections.
+ * Functions for generating pseudo-random CPER PCI/PCI-X bus error sections.
  * 
  * Author: Lawrence.Tang@arm.com
  **/
@@ -9,7 +9,7 @@
 #include "../gen-utils.h"
 #include "gen-sections.h"
 
-//Generates a single psuedo-random PCI/PCI-X bus error section, saving the resulting address to the given
+//Generates a single pseudo-random PCI/PCI-X bus error section, saving the resulting address to the given
 //location. Returns the size of the newly created section.
 size_t generate_section_pci_bus(void** location)
 {
@@ -23,7 +23,7 @@
     UINT32* reserved = (UINT32*)(bytes + 20);
     *reserved = 0;
     UINT64* bus_command = (UINT64*)(bytes + 40);
-    *bus_command &= 0x100000000000000; //Bus command bytes bar bit 56.
+    *bus_command &= (0b1 << 56); //Bus command bytes bar bit 56.
 
     //Fix values that could be above range.
     UINT16* error_type = (UINT16*)(bytes + 16);
diff --git a/generator/sections/gen-section-pci-dev.c b/generator/sections/gen-section-pci-dev.c
index f6a8bcc..7913b9a 100644
--- a/generator/sections/gen-section-pci-dev.c
+++ b/generator/sections/gen-section-pci-dev.c
@@ -1,5 +1,5 @@
 /**
- * Functions for generating psuedo-random CPER PCI component error sections.
+ * Functions for generating pseudo-random CPER PCI component error sections.
  * 
  * Author: Lawrence.Tang@arm.com
  **/
@@ -9,7 +9,7 @@
 #include "../gen-utils.h"
 #include "gen-sections.h"
 
-//Generates a single psuedo-random PCI component error section, saving the resulting address to the given
+//Generates a single pseudo-random PCI component error section, saving the resulting address to the given
 //location. Returns the size of the newly created section.
 size_t generate_section_pci_dev(void** location)
 {
diff --git a/generator/sections/gen-section-pcie.c b/generator/sections/gen-section-pcie.c
index d7b34ec..cace516 100644
--- a/generator/sections/gen-section-pcie.c
+++ b/generator/sections/gen-section-pcie.c
@@ -1,5 +1,5 @@
 /**
- * Functions for generating psuedo-random CPER PCIe error sections.
+ * Functions for generating pseudo-random CPER PCIe error sections.
  * 
  * Author: Lawrence.Tang@arm.com
  **/
@@ -11,7 +11,7 @@
 
 #define PCIE_PORT_TYPES (int []){0, 1, 4, 5, 6, 7, 8, 9, 10}
 
-//Generates a single psuedo-random PCIe error section, saving the resulting address to the given
+//Generates a single pseudo-random PCIe error section, saving the resulting address to the given
 //location. Returns the size of the newly created section.
 size_t generate_section_pcie(void** location)
 {
diff --git a/sections/cper-section-arm.h b/sections/cper-section-arm.h
index 2e14b11..aa986ed 100644
--- a/sections/cper-section-arm.h
+++ b/sections/cper-section-arm.h
@@ -73,7 +73,7 @@
   UINT64  MIDR_EL1;
   UINT32 RunningState;
   UINT32 PsciState;
-} EFI_ARM_ERROR_RECORD;
+} __attribute__((packed, aligned(1))) EFI_ARM_ERROR_RECORD;
 
 ///
 /// ARM Processor Error Information Structure
@@ -149,7 +149,7 @@
   UINT16 Version;
   UINT16 RegisterContextType;
   UINT32 RegisterArraySize;
-} EFI_ARM_CONTEXT_INFORMATION_HEADER;
+} __attribute__((packed, aligned(1))) EFI_ARM_CONTEXT_INFORMATION_HEADER;
 
 ///
 /// ARM Processor Context Register Types
diff --git a/sections/cper-section-pci-dev.h b/sections/cper-section-pci-dev.h
index 65c18d8..ceb8a44 100644
--- a/sections/cper-section-pci-dev.h
+++ b/sections/cper-section-pci-dev.h
@@ -27,7 +27,7 @@
   EFI_PCI_PCIX_DEVICE_ID_INFO IdInfo;
   UINT32                      MemoryNumber;
   UINT32                      IoNumber;
-} EFI_PCI_PCIX_DEVICE_ERROR_DATA;
+} __attribute__((packed, aligned(1))) EFI_PCI_PCIX_DEVICE_ERROR_DATA;
 
 json_object* cper_section_pci_dev_to_ir(void* section, EFI_ERROR_SECTION_DESCRIPTOR* descriptor);
 void ir_section_pci_dev_to_cper(json_object* section, FILE* out);