diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..f374d0b
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Billie Hilton <587740+billiegoose@users.noreply.github.com> <wmhilton@gmail.com>
+Billie Hilton <587740+billiegoose@users.noreply.github.com> <william.hilton@ge.com>
diff --git a/bin/g b/bin/g
index 62a134d..555220c 100755
--- a/bin/g
+++ b/bin/g
@@ -533,15 +533,15 @@ fi
 log)
 git log --color \
         --graph \
-        --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset %C(bold blue)<name-%G?>{<%an>}{%GS}</name>%Creset <color-%G?>{%Cgreen}{%Cred}</color><validity-%G?>%Creset' \
+        --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset %C(bold blue)<name-%G?>{%aN}{%GS}</name>%Creset <color-%G?>{%Cgreen}{%Cred}</color><validity-%G?>%Creset' \
         --abbrev-commit -10 "${@:2}" \
-| sed 's/<name-N>{\(.*\)}{\(.*\)}<\/name>/\1/g' \
-| sed 's/<name-.>{\(.*\)}{\(.*\)}<\/name>/\2/g' \
+| sed 's/<name-[NGX]>{\(.*\)}{\(.*\)}<\/name>/\1/g' \
+| sed 's/<name-[UYBE]>{\(.*\)}{\(.*\)}<\/name>/\2/g' \
 | sed 's/<color-N>{\(.*\)}{\(.*\)}<\/color>//g' \
 | sed 's/<color-[GUX]>{\(.*\)}{\(.*\)}<\/color>/\1/g' \
 | sed 's/<color-[YBE]>{\(.*\)}{\(.*\)}<\/color>/\2/g' \
 | sed 's/<validity-N>//g' \
-| sed 's/<validity-G>/good/g' \
+| sed 's/<validity-G>/✓/g' \
 | sed 's/<validity-U>/unknown/g' \
 | sed 's/<validity-X>/expired/g' \
 | sed 's/<validity-Y>/expired/g' \