diff --git a/include/pemagine/pe_consts.h b/include/pemagine/pe_consts.h
index e7bd657..419266b 100644
--- a/include/pemagine/pe_consts.h
+++ b/include/pemagine/pe_consts.h
@@ -178,35 +178,35 @@
 #define PE_IMAGE_COMDAT_SELECT_EXACT_MATCH                   PE_ARBITRARY         (0x00000004)
 #define PE_IMAGE_COMDAT_SELECT_ASSOCIATIVE                   PE_ARBITRARY         (0x00000005)
 #define PE_IMAGE_COMDAT_SELECT_LARGEST                       PE_ARBITRARY         (0x00000006)
-#define PE_IMAGE_DLL_RESERVED_X0001                          PE_BITWISE           (0x00000000)
-#define PE_IMAGE_DLL_RESERVED_X0002                          PE_BITWISE           (0x00000000)
-#define PE_IMAGE_DLL_RESERVED_X0004                          PE_BITWISE           (0x00000000)
-#define PE_IMAGE_DLL_RESERVED_X0008                          PE_BITWISE           (0x00000000)
-#define PE_IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE            PE_BITWISE           (0x00000000)
-#define PE_IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY         PE_BITWISE           (0x00000000)
-#define PE_IMAGE_DLL_CHARACTERISTICS_NX_COMPAT               PE_BITWISE           (0x00000000)
-#define PE_IMAGE_DLL_CHARACTERISTICS_NO_ISOLATION            PE_BITWISE           (0x00000000)
-#define PE_IMAGE_DLL_CHARACTERISTICS_NO_SEH                  PE_BITWISE           (0x00000000)
-#define PE_IMAGE_DLL_CHARACTERISTICS_NO_BIND                 PE_BITWISE           (0x00000000)
-#define PE_IMAGE_DLL_RESERVED_X1000                          PE_BITWISE           (0x00000000)
-#define PE_IMAGE_DLL_CHARACTERISTICS_WDM_DRIVER              PE_BITWISE           (0x00000000)
-#define PE_IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE   PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_RELOCS_STRIPPED                        PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_EXECUTABLE_IMAGE                       PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_LINE_NUMS_STRIPPED                     PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_LOCAL_SYMS_STRIPPED                    PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_AGGRESSIVE_WS_TRIM                     PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_LARGE_ADDRESS_AWARE                    PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_RESERVED_CHARACTERISTIC                PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_BYTES_REVERSED_LO                      PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_32BIT_MACHINE                          PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_DEBUG_STRIPPED                         PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP                PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_NET_RUN_FROM_SWAP                      PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_SYSTEM                                 PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_DLL                                    PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_UP_SYSTEM_ONLY                         PE_BITWISE           (0x00000000)
-#define PE_IMAGE_FILE_BYTES_REVERSED_HI                      PE_BITWISE           (0x00000000)
+#define PE_IMAGE_DLL_RESERVED_x0001                          PE_BITWISE           (0x00000001)
+#define PE_IMAGE_DLL_RESERVED_x0002                          PE_BITWISE           (0x00000002)
+#define PE_IMAGE_DLL_RESERVED_x0004                          PE_BITWISE           (0x00000004)
+#define PE_IMAGE_DLL_RESERVED_x0008                          PE_BITWISE           (0x00000008)
+#define PE_IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE            PE_BITWISE           (0x00000040)
+#define PE_IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY         PE_BITWISE           (0x00000080)
+#define PE_IMAGE_DLL_CHARACTERISTICS_NX_COMPAT               PE_BITWISE           (0x00000100)
+#define PE_IMAGE_DLL_CHARACTERISTICS_NO_ISOLATION            PE_BITWISE           (0x00000200)
+#define PE_IMAGE_DLL_CHARACTERISTICS_NO_SEH                  PE_BITWISE           (0x00000400)
+#define PE_IMAGE_DLL_CHARACTERISTICS_NO_BIND                 PE_BITWISE           (0x00000800)
+#define PE_IMAGE_DLL_RESERVED_x1000                          PE_BITWISE           (0x00001000)
+#define PE_IMAGE_DLL_CHARACTERISTICS_WDM_DRIVER              PE_BITWISE           (0x00002000)
+#define PE_IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE   PE_BITWISE           (0x00008000)
+#define PE_IMAGE_FILE_RELOCS_STRIPPED                        PE_BITWISE           (0x00000001)
+#define PE_IMAGE_FILE_EXECUTABLE_IMAGE                       PE_BITWISE           (0x00000002)
+#define PE_IMAGE_FILE_LINE_NUMS_STRIPPED                     PE_BITWISE           (0x00000004)
+#define PE_IMAGE_FILE_LOCAL_SYMS_STRIPPED                    PE_BITWISE           (0x00000008)
+#define PE_IMAGE_FILE_AGGRESSIVE_WS_TRIM                     PE_BITWISE           (0x00000010)
+#define PE_IMAGE_FILE_LARGE_ADDRESS_AWARE                    PE_BITWISE           (0x00000020)
+#define PE_IMAGE_FILE_RESERVED_CHARACTERISTIC                PE_BITWISE           (0x00000040)
+#define PE_IMAGE_FILE_BYTES_REVERSED_LO                      PE_BITWISE           (0x00000080)
+#define PE_IMAGE_FILE_32BIT_MACHINE                          PE_BITWISE           (0x00000100)
+#define PE_IMAGE_FILE_DEBUG_STRIPPED                         PE_BITWISE           (0x00000200)
+#define PE_IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP                PE_BITWISE           (0x00000400)
+#define PE_IMAGE_FILE_NET_RUN_FROM_SWAP                      PE_BITWISE           (0x00000800)
+#define PE_IMAGE_FILE_SYSTEM                                 PE_BITWISE           (0x00001000)
+#define PE_IMAGE_FILE_DLL                                    PE_BITWISE           (0x00002000)
+#define PE_IMAGE_FILE_UP_SYSTEM_ONLY                         PE_BITWISE           (0x00004000)
+#define PE_IMAGE_FILE_BYTES_REVERSED_HI                      PE_BITWISE           (0x00008000)
 #define PE_IMAGE_DEBUG_TYPE_UNKNOWN                          PE_ARBITRARY         (0x00000000)
 #define PE_IMAGE_DEBUG_TYPE_COFF                             PE_ARBITRARY         (0x00000001)
 #define PE_IMAGE_DEBUG_TYPE_CODEVIEW                         PE_ARBITRARY         (0x00000002)
@@ -261,46 +261,46 @@
 #define PE_MAGIC_ROM_IMAGE                                   PE_ARBITRARY         (0x00000107)
 #define PE_MAGIC_PE32                                        PE_ARBITRARY         (0x0000010b)
 #define PE_MAGIC_PE32_PLUS                                   PE_ARBITRARY         (0x0000020b)
-#define PE_IMAGE_SCN_RESERVED_X00000001                      PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_RESERVED_X00000002                      PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_RESERVED_X00000004                      PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_TYPE_NO_PAD                             PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_RESERVED_X00000010                      PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_CNT_CODE                                PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_CNT_INITIALIZED_DATA                    PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_CNT_UNINITIALIZED_DATA                  PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_LNK_OTHER                               PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_LNK_INFO                                PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_RESERVED_X00000400                      PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_LNK_REMOVE                              PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_LNK_COMDAT                              PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_GPREL                                   PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_MEM_PURGEABLE                           PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_MEM_16BIT                               PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_MEM_LOCKED                              PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_MEM_PRELOAD                             PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_ALIGN_1BYTES                            PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_ALIGN_2BYTES                            PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_ALIGN_4BYTES                            PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_ALIGN_8BYTES                            PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_ALIGN_16BYTES                           PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_ALIGN_32BYTES                           PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_ALIGN_64BYTES                           PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_ALIGN_128BYTES                          PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_ALIGN_256BYTES                          PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_ALIGN_512BYTES                          PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_ALIGN_1024BYTES                         PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_ALIGN_2048BYTES                         PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_ALIGN_4096BYTES                         PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_ALIGN_8192BYTES                         PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_LNK_NRELOC_OVFL                         PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_MEM_DISCARDABLE                         PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_MEM_NOT_CACHED                          PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_MEM_NOT_PAGED                           PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_MEM_SHARED                              PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_MEM_EXECUTE                             PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_MEM_READ                                PE_BITWISE           (0x00000000)
-#define PE_IMAGE_SCN_MEM_WRITE                               PE_BITWISE           (0x00000000)
+#define PE_IMAGE_SCN_RESERVED_x00000001                      PE_BITWISE           (0x00000001)
+#define PE_IMAGE_SCN_RESERVED_x00000002                      PE_BITWISE           (0x00000002)
+#define PE_IMAGE_SCN_RESERVED_x00000004                      PE_BITWISE           (0x00000004)
+#define PE_IMAGE_SCN_TYPE_NO_PAD                             PE_BITWISE           (0x00000008)
+#define PE_IMAGE_SCN_RESERVED_x00000010                      PE_BITWISE           (0x00000010)
+#define PE_IMAGE_SCN_CNT_CODE                                PE_BITWISE           (0x00000020)
+#define PE_IMAGE_SCN_CNT_INITIALIZED_DATA                    PE_BITWISE           (0x00000040)
+#define PE_IMAGE_SCN_CNT_UNINITIALIZED_DATA                  PE_BITWISE           (0x00000080)
+#define PE_IMAGE_SCN_LNK_OTHER                               PE_BITWISE           (0x00000100)
+#define PE_IMAGE_SCN_LNK_INFO                                PE_BITWISE           (0x00000200)
+#define PE_IMAGE_SCN_RESERVED_x00000400                      PE_BITWISE           (0x00000400)
+#define PE_IMAGE_SCN_LNK_REMOVE                              PE_BITWISE           (0x00000800)
+#define PE_IMAGE_SCN_LNK_COMDAT                              PE_BITWISE           (0x00001000)
+#define PE_IMAGE_SCN_GPREL                                   PE_BITWISE           (0x00008000)
+#define PE_IMAGE_SCN_MEM_PURGEABLE                           PE_BITWISE           (0x00020000)
+#define PE_IMAGE_SCN_MEM_16BIT                               PE_BITWISE           (0x00020000)
+#define PE_IMAGE_SCN_MEM_LOCKED                              PE_BITWISE           (0x00040000)
+#define PE_IMAGE_SCN_MEM_PRELOAD                             PE_BITWISE           (0x00080000)
+#define PE_IMAGE_SCN_ALIGN_1BYTES                            PE_BITWISE           (0x00100000)
+#define PE_IMAGE_SCN_ALIGN_2BYTES                            PE_BITWISE           (0x00200000)
+#define PE_IMAGE_SCN_ALIGN_4BYTES                            PE_BITWISE           (0x00300000)
+#define PE_IMAGE_SCN_ALIGN_8BYTES                            PE_BITWISE           (0x00400000)
+#define PE_IMAGE_SCN_ALIGN_16BYTES                           PE_BITWISE           (0x00500000)
+#define PE_IMAGE_SCN_ALIGN_32BYTES                           PE_BITWISE           (0x00600000)
+#define PE_IMAGE_SCN_ALIGN_64BYTES                           PE_BITWISE           (0x00700000)
+#define PE_IMAGE_SCN_ALIGN_128BYTES                          PE_BITWISE           (0x00800000)
+#define PE_IMAGE_SCN_ALIGN_256BYTES                          PE_BITWISE           (0x00900000)
+#define PE_IMAGE_SCN_ALIGN_512BYTES                          PE_BITWISE           (0x00a00000)
+#define PE_IMAGE_SCN_ALIGN_1024BYTES                         PE_BITWISE           (0x00b00000)
+#define PE_IMAGE_SCN_ALIGN_2048BYTES                         PE_BITWISE           (0x00c00000)
+#define PE_IMAGE_SCN_ALIGN_4096BYTES                         PE_BITWISE           (0x00d00000)
+#define PE_IMAGE_SCN_ALIGN_8192BYTES                         PE_BITWISE           (0x00e00000)
+#define PE_IMAGE_SCN_LNK_NRELOC_OVFL                         PE_BITWISE           (0x01000000)
+#define PE_IMAGE_SCN_MEM_DISCARDABLE                         PE_BITWISE           (0x02000000)
+#define PE_IMAGE_SCN_MEM_NOT_CACHED                          PE_BITWISE           (0x04000000)
+#define PE_IMAGE_SCN_MEM_NOT_PAGED                           PE_BITWISE           (0x08000000)
+#define PE_IMAGE_SCN_MEM_SHARED                              PE_BITWISE           (0x10000000)
+#define PE_IMAGE_SCN_MEM_EXECUTE                             PE_BITWISE           (0x20000000)
+#define PE_IMAGE_SCN_MEM_READ                                PE_BITWISE           (0x40000000)
+#define PE_IMAGE_SCN_MEM_WRITE                               PE_BITWISE           (0x80000000)
 #define PE_IMAGE_SYM_DEBUG                                   PE_ARBITRARY         (        -2)
 #define PE_IMAGE_SYM_ABSOLUTE                                PE_ARBITRARY         (        -1)
 #define PE_IMAGE_SYM_UNDEFINED                               PE_ARBITRARY         (0x00000000)