Index: htelfhd.cc
--- htelfhd.cc.orig
+++ htelfhd.cc
@@ -29,20 +29,34 @@
 static ht_mask_ptable elfheader[]=
 {
 	{"ident", 0},
-	{"    magic",		STATICTAG_EDIT_BYTE("00000000")" "STATICTAG_EDIT_BYTE("00000001")" "STATICTAG_EDIT_BYTE("00000002")" "STATICTAG_EDIT_BYTE("00000003")" = "STATICTAG_EDIT_CHAR("00000000") STATICTAG_EDIT_CHAR("00000001") STATICTAG_EDIT_CHAR("00000002") STATICTAG_EDIT_CHAR("00000003")},
-	{"    class",		STATICTAG_EDIT_BYTE("00000004")" ("STATICTAG_DESC_BYTE("00000004", ATOM_ELF_CLASS_STR)")"},
-	{"    data",		STATICTAG_EDIT_BYTE("00000005")" ("STATICTAG_DESC_BYTE("00000005", ATOM_ELF_DATA_STR)")"},
+	{"    magic",		STATICTAG_EDIT_BYTE("00000000") 
+	                    " " STATICTAG_EDIT_BYTE("00000001") 
+	                    " " STATICTAG_EDIT_BYTE("00000002")
+	                    " " STATICTAG_EDIT_BYTE("00000003")
+	                    " = " STATICTAG_EDIT_CHAR("00000000") 
+	                          STATICTAG_EDIT_CHAR("00000001") 
+	                          STATICTAG_EDIT_CHAR("00000002") 
+	                          STATICTAG_EDIT_CHAR("00000003")},
+	{"    class",		STATICTAG_EDIT_BYTE("00000004") " (" STATICTAG_DESC_BYTE("00000004", ATOM_ELF_CLASS_STR) ")"},
+	{"    data",		STATICTAG_EDIT_BYTE("00000005") " (" STATICTAG_DESC_BYTE("00000005", ATOM_ELF_DATA_STR) ")"},
 	{"    version",		STATICTAG_EDIT_BYTE("00000006")},
-	{"    OS ABI",		STATICTAG_EDIT_BYTE("00000007")" ("STATICTAG_DESC_BYTE("00000007", ATOM_ELF_OS_ABI_STR)")"},
+	{"    OS ABI",		STATICTAG_EDIT_BYTE("00000007") " (" STATICTAG_DESC_BYTE("00000007", ATOM_ELF_OS_ABI_STR) ")"},
 	{"    version",		STATICTAG_EDIT_BYTE("00000008")},
-	{"    reserved",	STATICTAG_EDIT_BYTE("00000009")" "STATICTAG_EDIT_BYTE("0000000a")" "STATICTAG_EDIT_BYTE("0000000b")" "STATICTAG_EDIT_BYTE("0000000c")" "STATICTAG_EDIT_BYTE("0000000d")" "STATICTAG_EDIT_BYTE("0000000e")" "STATICTAG_EDIT_BYTE("0000000f")},
+	{"    reserved",	STATICTAG_EDIT_BYTE("00000009") 
+	                    " " STATICTAG_EDIT_BYTE("0000000a")
+	                    " " STATICTAG_EDIT_BYTE("0000000b")
+	                    " " STATICTAG_EDIT_BYTE("0000000c")
+	                    " " STATICTAG_EDIT_BYTE("0000000d")
+	                    " " STATICTAG_EDIT_BYTE("0000000e")
+	                    " " STATICTAG_EDIT_BYTE("0000000f")},
 	{0, 0}
 };
 
 static ht_mask_ptable elfheader32[]=
 {
-	{"type",			STATICTAG_EDIT_WORD_VE("00000010")" ("STATICTAG_DESC_WORD_VE("00000010", ATOM_ELF_TYPE_STR)")"},
-	{"machine",			STATICTAG_EDIT_WORD_VE("00000012")" ("STATICTAG_DESC_WORD_VE("00000012", ATOM_ELF_MACHINE_STR)")"},
+	{"type",			STATICTAG_EDIT_WORD_VE("00000010")
+	                           " (" STATICTAG_DESC_WORD_VE("00000010", ATOM_ELF_TYPE_STR) ")"},
+	{"machine",			STATICTAG_EDIT_WORD_VE("00000012") " (" STATICTAG_DESC_WORD_VE("00000012", ATOM_ELF_MACHINE_STR) ")"},
 	{"version",			STATICTAG_EDIT_DWORD_VE("00000014")},
 	{"entrypoint",			STATICTAG_EDIT_DWORD_VE("00000018")},
 	{"program header offset",	STATICTAG_EDIT_DWORD_VE("0000001c")},
@@ -59,8 +73,8 @@ static ht_mask_ptable elfheader32[]=
 
 static ht_mask_ptable elfheader64[]=
 {
-	{"type",			STATICTAG_EDIT_WORD_VE("00000010")" ("STATICTAG_DESC_WORD_VE("00000010", ATOM_ELF_TYPE_STR)")"},
-	{"machine",			STATICTAG_EDIT_WORD_VE("00000012")" ("STATICTAG_DESC_WORD_VE("00000012", ATOM_ELF_MACHINE_STR)")"},
+	{"type",			STATICTAG_EDIT_WORD_VE("00000010") " (" STATICTAG_DESC_WORD_VE("00000010", ATOM_ELF_TYPE_STR)")"},
+	{"machine",			STATICTAG_EDIT_WORD_VE("00000012") " (" STATICTAG_DESC_WORD_VE("00000012", ATOM_ELF_MACHINE_STR)")"},
 	{"version",			STATICTAG_EDIT_DWORD_VE("00000014")},
 	{"entrypoint",			STATICTAG_EDIT_QWORD_VE("00000018")},
 	{"program header offset",	STATICTAG_EDIT_QWORD_VE("00000020")},