diff --git a/src/HexManiac.Core/Models/AutoSearchModel.cs b/src/HexManiac.Core/Models/AutoSearchModel.cs
index 4b1d98f3..693c7408 100644
--- a/src/HexManiac.Core/Models/AutoSearchModel.cs
+++ b/src/HexManiac.Core/Models/AutoSearchModel.cs
@@ -89,8 +89,8 @@ namespace HavenSoft.HexManiac.Core.Models {
             ObserveAnchorWritten(noChangeDelta, "items", itemdata);
          }
 
-         // ^pokestats[hp. attack. def. speed. spatk. spdef. type1. type2. catchRate. baseExp. evs: item1: item2: genderratio. steps2hatch. basehappiness. growthrate. egg1. egg2. ability1. ability2. runrate. unknown. padding:]pokenames
-
+         // ^pokestats[hp. attack. def. speed. spatk. spdef. type1.types type2.types catchRate. baseExp. evs: item1:items item2:items genderratio. steps2hatch. basehappiness. growthrate. egg1. egg2. ability1.abilitynames ability2.abilitynames runrate. unknown. padding:]pokenames
+         // 
          // abilitydescriptions[description<"">]abilitynames
 
          // @3D4294 ^itemicons[image<> palette<>]items
diff --git a/src/HexManiac.Core/Models/Runs/ArrayRun.cs b/src/HexManiac.Core/Models/Runs/ArrayRun.cs
index 759e780a..c3d7e57f 100644
--- a/src/HexManiac.Core/Models/Runs/ArrayRun.cs
+++ b/src/HexManiac.Core/Models/Runs/ArrayRun.cs
@@ -62,7 +62,7 @@ namespace HavenSoft.HexManiac.Core.Models.Runs {
 
          // sweet, we can convert from the integer value to the enum value
          var elementStart = enumArray.Start + enumArray.ElementLength * resultAsInteger;
-         var valueWithQuotes = PCSString.Convert(model, elementStart, firstContent.Length);
+         var valueWithQuotes = PCSString.Convert(model, elementStart, firstContent.Length).Trim();
          var value = valueWithQuotes.Substring(1, valueWithQuotes.Length - 2);
 
          // use ~2 postfix for a value if an earlier entry in the array has the same string
diff --git a/src/HexManiac.WPF/Implementations/FormatDrawer.cs b/src/HexManiac.WPF/Implementations/FormatDrawer.cs
index d669e6b5..0b0ee028 100644
--- a/src/HexManiac.WPF/Implementations/FormatDrawer.cs
+++ b/src/HexManiac.WPF/Implementations/FormatDrawer.cs
@@ -177,14 +177,14 @@ namespace HavenSoft.HexManiac.WPF.Implementations {
             CultureInfo.CurrentCulture,
             FlowDirection.LeftToRight,
             typeface,
-            FontSize,
-            Solarized.Brushes.Cyan,
+            FontSize * 3 / 4,
+            Solarized.Brushes.Yellow,
             1.0);
 
-         var xOffset = CellTextOffset.X;
-         xOffset += HexContent.CellWidth / 2 * (integerEnum.Length - 1); // adjust based on number of cells to use
-         xOffset -= (stringValue.Length - 2) * 5; // adjust based on width of text
+         var xOffset = CellTextOffset.X / 2;
+         context.PushClip(new RectangleGeometry(new Rect(0, 0, HexContent.CellWidth * integerEnum.Length, HexContent.CellHeight)));
          context.DrawText(text, new Point(xOffset, CellTextOffset.Y));
+         context.Pop();
       }
 
       private void Underline(Brush brush, bool isStart, bool isEnd) {