diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9c142eb..4b9a5ee 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -73,13 +73,49 @@ jobs:
         run: |
           New-Item -ItemType Directory -Force -Path releases
 
-          $rids = @('win-x64', 'linux-x64', 'osx-x64', 'osx-arm64')
-          foreach ($rid in $rids) {
+          # Package Windows and Linux as flat zips
+          foreach ($rid in @('win-x64', 'linux-x64')) {
             if (Test-Path 'README.md') { Copy-Item 'README.md' "publish/$rid/" }
             if (Test-Path 'LICENSE') { Copy-Item 'LICENSE' "publish/$rid/" }
             Compress-Archive -Path "publish/$rid/*" -DestinationPath "releases/PerformanceStudio-$rid.zip" -Force
           }
 
+          # Package macOS as proper .app bundles
+          foreach ($rid in @('osx-x64', 'osx-arm64')) {
+            $appName = "PerformanceStudio.app"
+            $bundleDir = "publish/$rid-bundle/$appName"
+
+            # Create .app bundle structure
+            New-Item -ItemType Directory -Force -Path "$bundleDir/Contents/MacOS"
+            New-Item -ItemType Directory -Force -Path "$bundleDir/Contents/Resources"
+
+            # Copy all published files into Contents/MacOS
+            Copy-Item -Path "publish/$rid/*" -Destination "$bundleDir/Contents/MacOS/" -Recurse
+
+            # Move Info.plist to Contents/ (it was copied to MacOS/ with the publish output)
+            if (Test-Path "$bundleDir/Contents/MacOS/Info.plist") {
+              Move-Item -Path "$bundleDir/Contents/MacOS/Info.plist" -Destination "$bundleDir/Contents/Info.plist" -Force
+            }
+
+            # Update version in Info.plist to match csproj
+            $plist = Get-Content "$bundleDir/Contents/Info.plist" -Raw
+            $plist = $plist -replace '(<key>CFBundleVersion</key>\s*<string>)[^<]*(</string>)', "`${1}$env:VERSION`${2}"
+            $plist = $plist -replace '(<key>CFBundleShortVersionString</key>\s*<string>)[^<]*(</string>)', "`${1}$env:VERSION`${2}"
+            Set-Content -Path "$bundleDir/Contents/Info.plist" -Value $plist -NoNewline
+
+            # Move icon to Contents/Resources
+            if (Test-Path "$bundleDir/Contents/MacOS/EDD.icns") {
+              Move-Item -Path "$bundleDir/Contents/MacOS/EDD.icns" -Destination "$bundleDir/Contents/Resources/EDD.icns" -Force
+            }
+
+            # Add README and LICENSE alongside the .app bundle
+            $wrapperDir = "publish/$rid-bundle"
+            if (Test-Path 'README.md') { Copy-Item 'README.md' "$wrapperDir/" }
+            if (Test-Path 'LICENSE') { Copy-Item 'LICENSE' "$wrapperDir/" }
+
+            Compress-Archive -Path "$wrapperDir/*" -DestinationPath "releases/PerformanceStudio-$rid.zip" -Force
+          }
+
           # Checksums
           $checksums = Get-ChildItem releases/*.zip | ForEach-Object {
             $hash = (Get-FileHash $_.FullName -Algorithm SHA256).Hash.ToLower()
diff --git a/src/PlanViewer.App/AboutWindow.axaml b/src/PlanViewer.App/AboutWindow.axaml
index 97d2223..71950bb 100644
--- a/src/PlanViewer.App/AboutWindow.axaml
+++ b/src/PlanViewer.App/AboutWindow.axaml
@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="PlanViewer.App.AboutWindow"
         Title="About Performance Studio"
-        Width="450" Height="460"
+        Width="450" Height="500"
         CanResize="False"
         WindowStartupLocation="CenterOwner"
         Icon="avares://PlanViewer.App/EDD.ico"
@@ -44,6 +44,17 @@
                        Text="www.erikdarling.com"
                        PointerPressed="DarlingDataLink_Click"
                        TextDecorations="Underline"/>
+            <StackPanel Orientation="Horizontal" Spacing="8" Margin="0,6,0,0">
+                <Button x:Name="CheckUpdateButton" Content="Check for Updates"
+                        Click="CheckUpdate_Click" Padding="10,4" FontSize="12"/>
+                <TextBlock x:Name="UpdateStatusText" FontSize="12" VerticalAlignment="Center"
+                           Foreground="{DynamicResource ForegroundBrush}"/>
+                <TextBlock x:Name="UpdateLink" FontSize="12" VerticalAlignment="Center"
+                           Foreground="{DynamicResource AccentBrush}"
+                           Cursor="Hand" IsVisible="False"
+                           TextDecorations="Underline"
+                           PointerPressed="UpdateLink_Click"/>
+            </StackPanel>
         </StackPanel>
 
         <!-- MCP Settings -->
diff --git a/src/PlanViewer.App/AboutWindow.axaml.cs b/src/PlanViewer.App/AboutWindow.axaml.cs
index 66a487e..9ed0f3f 100644
--- a/src/PlanViewer.App/AboutWindow.axaml.cs
+++ b/src/PlanViewer.App/AboutWindow.axaml.cs
@@ -15,6 +15,7 @@
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using PlanViewer.App.Mcp;
+using PlanViewer.App.Services;
 
 namespace PlanViewer.App;
 
@@ -72,6 +73,41 @@ private async void CopyMcpCommand_Click(object? sender, RoutedEventArgs e)
         }
     }
 
+    private string? _updateUrl;
+
+    private async void CheckUpdate_Click(object? sender, RoutedEventArgs e)
+    {
+        CheckUpdateButton.IsEnabled = false;
+        UpdateStatusText.Text = "Checking...";
+        UpdateLink.IsVisible = false;
+
+        var currentVersion = Assembly.GetExecutingAssembly().GetName().Version ?? new Version(0, 0, 0);
+        var result = await UpdateChecker.CheckAsync(currentVersion);
+
+        if (result.Error != null)
+        {
+            UpdateStatusText.Text = $"Error: {result.Error}";
+        }
+        else if (result.UpdateAvailable)
+        {
+            UpdateStatusText.Text = $"New version available:";
+            UpdateLink.Text = result.LatestVersion;
+            UpdateLink.IsVisible = true;
+            _updateUrl = result.ReleaseUrl;
+        }
+        else
+        {
+            UpdateStatusText.Text = $"You're up to date ({result.LatestVersion})";
+        }
+
+        CheckUpdateButton.IsEnabled = true;
+    }
+
+    private void UpdateLink_Click(object? sender, PointerPressedEventArgs e)
+    {
+        if (_updateUrl != null) OpenUrl(_updateUrl);
+    }
+
     private void CloseButton_Click(object? sender, RoutedEventArgs e) => Close();
 
     private static void OpenUrl(string url)
diff --git a/src/PlanViewer.App/Controls/PlanViewerControl.axaml b/src/PlanViewer.App/Controls/PlanViewerControl.axaml
index b050af6..503228f 100644
--- a/src/PlanViewer.App/Controls/PlanViewerControl.axaml
+++ b/src/PlanViewer.App/Controls/PlanViewerControl.axaml
@@ -52,22 +52,24 @@
                       Foreground="{DynamicResource ForegroundBrush}"
                       Background="Transparent"
                       BorderThickness="0"
-                      Padding="0">
+                      Padding="0"
+                      HorizontalAlignment="Stretch"
+                      HorizontalContentAlignment="Stretch">
                 <Expander.Header>
                     <TextBlock x:Name="InsightsHeader" Text="  Plan Insights"
                                FontWeight="SemiBold"
                                Foreground="{DynamicResource ForegroundBrush}"/>
                 </Expander.Header>
-                <Grid MaxHeight="220">
+                <Grid MaxHeight="220" HorizontalAlignment="Stretch">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" MinWidth="0"/>
                         <ColumnDefinition Width="Auto" MinWidth="180"/>
                         <ColumnDefinition Width="*" MinWidth="200"/>
                         <ColumnDefinition Width="*" MinWidth="200"/>
-                        <ColumnDefinition Width="*" MinWidth="200"/>
+                        <ColumnDefinition Width="2*" MinWidth="280"/>
                     </Grid.ColumnDefinitions>
 
-                    <!-- Server Context (first, only visible when connected) -->
+                    <!-- Server Context (first, placeholder when no metadata) -->
                     <Border x:Name="ServerContextBorder" Grid.Column="0" Padding="10,4,10,8"
                             Background="#1A1A2D"
                             BorderBrush="#3A3A5A" BorderThickness="0,0,1,0"
@@ -81,6 +83,10 @@
                                            Foreground="#9B9BFF"
                                            Margin="0,0,0,6"/>
                                 <StackPanel x:Name="ServerContextContent"/>
+                                <TextBlock x:Name="ServerContextEmpty"
+                                           Text="Run Repro Script to capture server context"
+                                           FontSize="12" IsVisible="False"
+                                           Foreground="{DynamicResource ForegroundBrush}"/>
                             </StackPanel>
                         </ScrollViewer>
                     </Border>
@@ -96,6 +102,10 @@
                                        Foreground="{DynamicResource ForegroundBrush}"
                                        Margin="0,0,0,4"/>
                             <StackPanel x:Name="RuntimeSummaryContent"/>
+                            <TextBlock x:Name="RuntimeSummaryEmpty"
+                                       Text="Estimated plan — no runtime stats"
+                                       FontSize="12" IsVisible="False"
+                                       Foreground="{DynamicResource ForegroundBrush}"/>
                         </StackPanel>
                     </Border>
 
@@ -145,7 +155,7 @@
                     <Border Grid.Column="4" Padding="10,4,10,8"
                             Background="#1A2A3D">
                         <ScrollViewer VerticalScrollBarVisibility="Auto"
-                                      HorizontalScrollBarVisibility="Disabled">
+                                      HorizontalScrollBarVisibility="Auto">
                             <StackPanel>
                                 <TextBlock x:Name="WaitStatsHeader"
                                            Text="Wait Stats"
diff --git a/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs b/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs
index 90d0b97..3be8573 100644
--- a/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/PlanViewerControl.axaml.cs
@@ -64,6 +64,11 @@ public partial class PlanViewerControl : UserControl
     private const double MaxZoom = 3.0;
     private string _label = "";
 
+    /// <summary>
+    /// Full path on disk when the plan was loaded from a file.
+    /// </summary>
+    public string? SourceFilePath { get; set; }
+
     // Node selection
     private Border? _selectedNodeBorder;
     private IBrush? _selectedNodeOriginalBorder;
@@ -418,21 +423,28 @@ private Border CreateNodeVisual(PlanNode node, int totalWarningCount = -1)
         // Operator name
         var fgBrush = FindBrushResource("ForegroundBrush");
 
+        // Operator name — for exchanges, show "Parallelism" + "(Gather Streams)" etc.
+        var opLabel = node.PhysicalOp;
+        if (node.PhysicalOp == "Parallelism" && !string.IsNullOrEmpty(node.LogicalOp)
+            && node.LogicalOp != "Parallelism")
+        {
+            opLabel = $"Parallelism\n({node.LogicalOp})";
+        }
         stack.Children.Add(new TextBlock
         {
-            Text = node.PhysicalOp,
+            Text = opLabel,
             FontSize = 10,
             FontWeight = FontWeight.SemiBold,
             Foreground = fgBrush,
             TextAlignment = TextAlignment.Center,
-            TextTrimming = TextTrimming.CharacterEllipsis,
+            TextWrapping = TextWrapping.Wrap,
             MaxWidth = PlanLayoutEngine.NodeWidth - 16,
             HorizontalAlignment = HorizontalAlignment.Center
         });
 
-        // Cost percentage
-        IBrush costColor = node.CostPercent >= 50 ? OrangeRedBrush
-            : node.CostPercent >= 25 ? OrangeBrush
+        // Cost percentage — only highlight in estimated plans; actual plans use duration/CPU colors
+        IBrush costColor = !node.HasActualStats && node.CostPercent >= 50 ? OrangeRedBrush
+            : !node.HasActualStats && node.CostPercent >= 25 ? OrangeBrush
             : fgBrush;
 
         stack.Children.Add(new TextBlock
@@ -447,25 +459,31 @@ private Border CreateNodeVisual(PlanNode node, int totalWarningCount = -1)
         // Actual plan stats: elapsed time, CPU time, and row counts
         if (node.HasActualStats)
         {
-            // Elapsed time -- red if >= 1 second
-            var elapsedSec = node.ActualElapsedMs / 1000.0;
-            IBrush elapsedBrush = elapsedSec >= 1.0 ? OrangeRedBrush : fgBrush;
+            // Compute own time (subtract children in row mode)
+            var ownElapsedMs = GetOwnElapsedMs(node);
+            var ownCpuMs = GetOwnCpuMs(node);
+
+            // Elapsed time -- color based on own time, not cumulative
+            var ownElapsedSec = ownElapsedMs / 1000.0;
+            IBrush elapsedBrush = ownElapsedSec >= 1.0 ? OrangeRedBrush
+                : ownElapsedSec >= 0.1 ? OrangeBrush : fgBrush;
             stack.Children.Add(new TextBlock
             {
-                Text = $"{elapsedSec:F3}s",
+                Text = $"{ownElapsedSec:F3}s",
                 FontSize = 10,
                 Foreground = elapsedBrush,
                 TextAlignment = TextAlignment.Center,
                 HorizontalAlignment = HorizontalAlignment.Center
             });
 
-            // CPU time -- red if >= 1 second
-            var cpuSec = node.ActualCPUMs / 1000.0;
-            IBrush cpuBrush = cpuSec >= 1.0 ? OrangeRedBrush : fgBrush;
+            // CPU time -- color based on own time
+            var ownCpuSec = ownCpuMs / 1000.0;
+            IBrush cpuBrush = ownCpuSec >= 1.0 ? OrangeRedBrush
+                : ownCpuSec >= 0.1 ? OrangeBrush : fgBrush;
             stack.Children.Add(new TextBlock
             {
-                Text = $"CPU: {cpuSec:F3}s",
-                FontSize = 9,
+                Text = $"CPU: {ownCpuSec:F3}s",
+                FontSize = 10,
                 Foreground = cpuBrush,
                 TextAlignment = TextAlignment.Center,
                 HorizontalAlignment = HorizontalAlignment.Center
@@ -481,7 +499,7 @@ private Border CreateNodeVisual(PlanNode node, int totalWarningCount = -1)
             stack.Children.Add(new TextBlock
             {
                 Text = $"{node.ActualRows:N0} of {estRows:N0}{accuracy}",
-                FontSize = 9,
+                FontSize = 10,
                 Foreground = rowBrush,
                 TextAlignment = TextAlignment.Center,
                 HorizontalAlignment = HorizontalAlignment.Center,
@@ -496,7 +514,7 @@ private Border CreateNodeVisual(PlanNode node, int totalWarningCount = -1)
             var objBlock = new TextBlock
             {
                 Text = node.FullObjectName ?? node.ObjectName,
-                FontSize = 9,
+                FontSize = 10,
                 Foreground = fgBrush,
                 TextAlignment = TextAlignment.Center,
                 TextWrapping = TextWrapping.Wrap,
@@ -1760,6 +1778,18 @@ private object BuildNodeTooltipContent(PlanNode node, List<PlanWarning>? allWarn
             AddTooltipRow(stack, "Actual Executions", $"{node.ActualExecutions:N0}");
         }
 
+        // Rebinds/Rewinds (spools and other operators with rebind/rewind data)
+        if (node.EstimateRebinds > 0 || node.EstimateRewinds > 0
+            || node.ActualRebinds > 0 || node.ActualRewinds > 0)
+        {
+            AddTooltipSection(stack, "Rebinds / Rewinds");
+            // Always show both estimated values when section is visible
+            AddTooltipRow(stack, "Est. Rebinds", $"{node.EstimateRebinds:N1}");
+            AddTooltipRow(stack, "Est. Rewinds", $"{node.EstimateRewinds:N1}");
+            if (node.ActualRebinds > 0) AddTooltipRow(stack, "Actual Rebinds", $"{node.ActualRebinds:N0}");
+            if (node.ActualRewinds > 0) AddTooltipRow(stack, "Actual Rewinds", $"{node.ActualRewinds:N0}");
+        }
+
         // I/O and CPU estimates
         if (node.EstimateIO > 0 || node.EstimateCPU > 0 || node.EstimatedRowSize > 0)
         {
@@ -1863,18 +1893,46 @@ private object BuildNodeTooltipContent(PlanNode node, List<PlanWarning>? allWarn
         if (warnings != null && warnings.Count > 0)
         {
             stack.Children.Add(new Separator { Margin = new Thickness(0, 6, 0, 6) });
-            foreach (var w in warnings)
+
+            if (allWarnings != null)
             {
-                var warnColor = w.Severity == PlanWarningSeverity.Critical ? "#E57373"
-                    : w.Severity == PlanWarningSeverity.Warning ? "#FFB347" : "#6BB5FF";
-                stack.Children.Add(new TextBlock
+                // Root node: show distinct warning type names only
+                var distinct = warnings
+                    .GroupBy(w => w.WarningType)
+                    .Select(g => (Type: g.Key, MaxSeverity: g.Max(w => w.Severity), Count: g.Count()))
+                    .OrderByDescending(g => g.MaxSeverity)
+                    .ThenBy(g => g.Type);
+
+                foreach (var (type, severity, count) in distinct)
                 {
-                    Text = $"\u26A0 {w.WarningType}: {w.Message}",
-                    Foreground = new SolidColorBrush(Color.Parse(warnColor)),
-                    FontSize = 11,
-                    TextWrapping = TextWrapping.Wrap,
-                    Margin = new Thickness(0, 2, 0, 0)
-                });
+                    var warnColor = severity == PlanWarningSeverity.Critical ? "#E57373"
+                        : severity == PlanWarningSeverity.Warning ? "#FFB347" : "#6BB5FF";
+                    var label = count > 1 ? $"\u26A0 {type} ({count})" : $"\u26A0 {type}";
+                    stack.Children.Add(new TextBlock
+                    {
+                        Text = label,
+                        Foreground = new SolidColorBrush(Color.Parse(warnColor)),
+                        FontSize = 11,
+                        Margin = new Thickness(0, 2, 0, 0)
+                    });
+                }
+            }
+            else
+            {
+                // Individual node: show full warning messages
+                foreach (var w in warnings)
+                {
+                    var warnColor = w.Severity == PlanWarningSeverity.Critical ? "#E57373"
+                        : w.Severity == PlanWarningSeverity.Warning ? "#FFB347" : "#6BB5FF";
+                    stack.Children.Add(new TextBlock
+                    {
+                        Text = $"\u26A0 {w.WarningType}: {w.Message}",
+                        Foreground = new SolidColorBrush(Color.Parse(warnColor)),
+                        FontSize = 11,
+                        TextWrapping = TextWrapping.Wrap,
+                        Margin = new Thickness(0, 2, 0, 0)
+                    });
+                }
             }
         }
 
@@ -2193,6 +2251,94 @@ private static void CollectWarnings(PlanNode node, List<PlanWarning> warnings)
             CollectWarnings(child, warnings);
     }
 
+    /// <summary>
+    /// Computes own CPU time for a node by subtracting child times in row mode.
+    /// Batch mode reports own time directly; row mode is cumulative from leaves up.
+    /// </summary>
+    private static long GetOwnCpuMs(PlanNode node)
+    {
+        if (node.ActualCPUMs <= 0) return 0;
+        var mode = node.ActualExecutionMode ?? node.ExecutionMode;
+        if (mode == "Batch") return node.ActualCPUMs;
+        var childSum = GetChildCpuMsSum(node);
+        return Math.Max(0, node.ActualCPUMs - childSum);
+    }
+
+    /// <summary>
+    /// Computes own elapsed time for a node by subtracting child times in row mode.
+    /// </summary>
+    private static long GetOwnElapsedMs(PlanNode node)
+    {
+        if (node.ActualElapsedMs <= 0) return 0;
+        var mode = node.ActualExecutionMode ?? node.ExecutionMode;
+        if (mode == "Batch") return node.ActualElapsedMs;
+
+        // Exchange operators: Thread 0 is the coordinator whose elapsed time is the
+        // wall clock for the entire parallel branch — not the operator's own work.
+        if (IsExchangeOperator(node))
+        {
+            // If we have worker thread data, use max of worker threads
+            var workerMax = node.PerThreadStats
+                .Where(t => t.ThreadId > 0)
+                .Select(t => t.ActualElapsedMs)
+                .DefaultIfEmpty(0)
+                .Max();
+            if (workerMax > 0)
+            {
+                var childSum = GetChildElapsedMsSum(node);
+                return Math.Max(0, workerMax - childSum);
+            }
+            // Thread 0 only (coordinator) — exchange does negligible own work
+            return 0;
+        }
+
+        var childElapsedSum = GetChildElapsedMsSum(node);
+        return Math.Max(0, node.ActualElapsedMs - childElapsedSum);
+    }
+
+    private static bool IsExchangeOperator(PlanNode node) =>
+        node.PhysicalOp == "Parallelism"
+        || node.LogicalOp is "Gather Streams" or "Distribute Streams" or "Repartition Streams";
+
+    private static long GetChildCpuMsSum(PlanNode node)
+    {
+        long sum = 0;
+        foreach (var child in node.Children)
+        {
+            if (child.ActualCPUMs > 0)
+                sum += child.ActualCPUMs;
+            else
+                sum += GetChildCpuMsSum(child); // skip through transparent operators
+        }
+        return sum;
+    }
+
+    private static long GetChildElapsedMsSum(PlanNode node)
+    {
+        long sum = 0;
+        foreach (var child in node.Children)
+        {
+            if (child.PhysicalOp == "Parallelism" && child.Children.Count > 0)
+            {
+                // Exchange: take max of children (parallel branches)
+                sum += child.Children
+                    .Where(c => c.ActualElapsedMs > 0)
+                    .Select(c => c.ActualElapsedMs)
+                    .DefaultIfEmpty(0)
+                    .Max();
+            }
+            else if (child.ActualElapsedMs > 0)
+            {
+                sum += child.ActualElapsedMs;
+            }
+            else
+            {
+                sum += GetChildElapsedMsSum(child); // skip through transparent operators
+            }
+        }
+        return sum;
+    }
+
     private void ShowWaitStats(List<WaitStatInfo> waits, bool isActualPlan)
     {
         WaitStatsContent.Children.Clear();
@@ -2217,14 +2363,10 @@ private void ShowWaitStats(List<WaitStatInfo> waits, bool isActualPlan)
         WaitStatsHeader.Text = $"  Wait Stats \u2014 {totalWait:N0}ms total";
 
         // Build a single Grid for all rows so columns align
-        // Wait type names are nvarchar(60), longest known is 51 chars
-        // Default UI font is proportional (~6.5px per char at size 12)
-        var longestName = sorted.Max(w => w.WaitType.Length);
-        var nameColWidth = longestName * 6.5 + 10;
-
+        // Name and duration auto-size; bar fills remaining space
         var grid = new Grid
         {
-            ColumnDefinitions = new ColumnDefinitions($"{nameColWidth},*,Auto")
+            ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto")
         };
         for (int i = 0; i < sorted.Count; i++)
             grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto));
@@ -2235,12 +2377,12 @@ private void ShowWaitStats(List<WaitStatInfo> waits, bool isActualPlan)
             var barFraction = maxWait > 0 ? (double)w.WaitTimeMs / maxWait : 0;
             var color = GetWaitCategoryColor(GetWaitCategory(w.WaitType));
 
-            // Wait type name
+            // Wait type name — colored by category
             var nameText = new TextBlock
             {
                 Text = w.WaitType,
                 FontSize = 12,
-                Foreground = new SolidColorBrush(Color.Parse("#E4E6EB")),
+                Foreground = new SolidColorBrush(Color.Parse(color)),
                 VerticalAlignment = VerticalAlignment.Center,
                 Margin = new Thickness(0, 2, 10, 2)
             };
@@ -2248,12 +2390,13 @@ private void ShowWaitStats(List<WaitStatInfo> waits, bool isActualPlan)
             Grid.SetColumn(nameText, 0);
             grid.Children.Add(nameText);
 
-            // Bar — fixed max width, proportional to largest wait
+            // Bar — semi-transparent category color, compact proportional indicator
+            var barColor = Color.Parse(color);
             var colorBar = new Border
             {
-                Width = Math.Max(4, barFraction * 300),
+                Width = Math.Max(4, barFraction * 60),
                 Height = 14,
-                Background = new SolidColorBrush(Color.Parse(color)),
+                Background = new SolidColorBrush(Color.FromArgb(0x60, barColor.R, barColor.G, barColor.B)),
                 CornerRadius = new CornerRadius(2),
                 HorizontalAlignment = HorizontalAlignment.Left,
                 VerticalAlignment = VerticalAlignment.Center,
@@ -2294,7 +2437,7 @@ private void ShowRuntimeSummary(PlanStatement statement)
         };
         int rowIndex = 0;
 
-        void AddRow(string label, string value)
+        void AddRow(string label, string value, string? color = null)
         {
             grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto));
 
@@ -2314,7 +2457,7 @@ void AddRow(string label, string value)
             {
                 Text = value,
                 FontSize = 11,
-                Foreground = new SolidColorBrush(Color.Parse(valueColor)),
+                Foreground = new SolidColorBrush(Color.Parse(color ?? valueColor)),
                 Margin = new Thickness(0, 1, 0, 1)
             };
             Grid.SetRow(valueText, rowIndex);
@@ -2324,6 +2467,10 @@ void AddRow(string label, string value)
             rowIndex++;
         }
 
+        // Efficiency thresholds: white >= 80%, yellow >= 60%, orange >= 40%, red < 40%
+        static string EfficiencyColor(double pct) => pct >= 80 ? "#E4E6EB"
+            : pct >= 60 ? "#FFD700" : pct >= 40 ? "#FFB347" : "#E57373";
+
         // Runtime stats (actual plans)
         if (statement.QueryTimeStats != null)
         {
@@ -2335,22 +2482,43 @@ void AddRow(string label, string value)
                 AddRow("UDF elapsed", $"{statement.QueryUdfElapsedTimeMs:N0}ms");
         }
 
-        // Memory grant
+        // Memory grant — color by utilization percentage
         if (statement.MemoryGrant != null)
         {
             var mg = statement.MemoryGrant;
-            AddRow("Memory grant", $"{mg.GrantedMemoryKB:N0} KB granted, {mg.MaxUsedMemoryKB:N0} KB used");
+            var grantPct = mg.GrantedMemoryKB > 0
+                ? (double)mg.MaxUsedMemoryKB / mg.GrantedMemoryKB * 100 : 100;
+            var grantColor = EfficiencyColor(grantPct);
+            AddRow("Memory grant",
+                $"{mg.GrantedMemoryKB:N0} KB granted, {mg.MaxUsedMemoryKB:N0} KB used ({grantPct:N0}%)",
+                grantColor);
             if (mg.GrantWaitTimeMs > 0)
-                AddRow("Grant wait", $"{mg.GrantWaitTimeMs:N0}ms");
+                AddRow("Grant wait", $"{mg.GrantWaitTimeMs:N0}ms", "#E57373");
         }
 
-        // DOP
+        // DOP + parallelism efficiency — color by efficiency
         if (statement.DegreeOfParallelism > 0)
-            AddRow("DOP", statement.DegreeOfParallelism.ToString());
+        {
+            var dopText = statement.DegreeOfParallelism.ToString();
+            string? dopColor = null;
+            if (statement.QueryTimeStats != null &&
+                statement.QueryTimeStats.ElapsedTimeMs > 0 &&
+                statement.QueryTimeStats.CpuTimeMs > 0 &&
+                statement.DegreeOfParallelism > 1)
+            {
+                // Speedup ratio: CPU/elapsed = 1.0 means serial, = DOP means perfect parallelism
+                var speedup = (double)statement.QueryTimeStats.CpuTimeMs / statement.QueryTimeStats.ElapsedTimeMs;
+                var efficiency = Math.Min(100.0, (speedup - 1.0) / (statement.DegreeOfParallelism - 1.0) * 100.0);
+                efficiency = Math.Max(0.0, efficiency);
+                dopText += $" ({efficiency:N0}% efficient)";
+                dopColor = EfficiencyColor(efficiency);
+            }
+            AddRow("DOP", dopText, dopColor);
+        }
         else if (statement.NonParallelPlanReason != null)
             AddRow("Serial", statement.NonParallelPlanReason);
 
-        // Thread stats
+        // Thread stats — color by utilization
         if (statement.ThreadStats != null)
         {
             var ts = statement.ThreadStats;
@@ -2358,10 +2526,12 @@ void AddRow(string label, string value)
             var totalReserved = ts.Reservations.Sum(r => r.ReservedThreads);
             if (totalReserved > 0)
             {
+                var threadPct = (double)ts.UsedThreads / totalReserved * 100;
+                var threadColor = EfficiencyColor(threadPct);
                 var threadText = ts.UsedThreads == totalReserved
                     ? $"{ts.UsedThreads} used ({totalReserved} reserved)"
                     : $"{ts.UsedThreads} used of {totalReserved} reserved ({totalReserved - ts.UsedThreads} inactive)";
-                AddRow("Threads", threadText);
+                AddRow("Threads", threadText, threadColor);
             }
             else
             {
@@ -2385,7 +2555,15 @@ void AddRow(string label, string value)
         if (!string.IsNullOrEmpty(statement.StatementOptmEarlyAbortReason))
             AddRow("Early abort", statement.StatementOptmEarlyAbortReason);
 
-        RuntimeSummaryContent.Children.Add(grid);
+        if (grid.Children.Count > 0)
+        {
+            RuntimeSummaryContent.Children.Add(grid);
+            RuntimeSummaryEmpty.IsVisible = false;
+        }
+        else
+        {
+            RuntimeSummaryEmpty.IsVisible = true;
+        }
         ShowServerContext();
     }
 
@@ -2394,10 +2572,13 @@ private void ShowServerContext()
         ServerContextContent.Children.Clear();
         if (_serverMetadata == null)
         {
-            ServerContextBorder.IsVisible = false;
+            ServerContextEmpty.IsVisible = true;
+            ServerContextBorder.IsVisible = true;
             return;
         }
 
+        ServerContextEmpty.IsVisible = false;
+
         var m = _serverMetadata;
         var fgColor = "#E4E6EB";
 
diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml b/src/PlanViewer.App/Controls/QuerySessionControl.axaml
index 7262b7e..be49eb2 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml
@@ -33,12 +33,12 @@
                             ToolTip.Tip="Capture estimated plan without executing (Ctrl+L)"/>
                     <TextBlock Text="|" VerticalAlignment="Center"
                                Foreground="{DynamicResource ForegroundBrush}" Margin="4,0"/>
-                    <Button x:Name="HumanAdviceButton" Content="&#x1F9D1; Advice for Humans"
+                    <Button x:Name="HumanAdviceButton" Content="&#x1F9D1; Human Advice"
                             Click="HumanAdvice_Click"
                             Height="28" Padding="10,0" FontSize="12" IsEnabled="False"
                             Theme="{StaticResource AppButton}"
                             ToolTip.Tip="Human-readable plan analysis"/>
-                    <Button x:Name="RobotAdviceButton" Content="&#x1F916; Advice for Robots"
+                    <Button x:Name="RobotAdviceButton" Content="&#x1F916; Robot Advice"
                             Click="RobotAdvice_Click"
                             Height="28" Padding="10,0" FontSize="12" IsEnabled="False"
                             Theme="{StaticResource AppButton}"
@@ -59,12 +59,12 @@
                             ToolTip.Tip="Analyze top queries from Query Store"/>
                     <TextBlock Text="|" VerticalAlignment="Center"
                                Foreground="{DynamicResource ForegroundBrush}" Margin="4,0"/>
-                    <Button x:Name="CopyReproButton" Content="&#x1F4CB; Copy Repro Script"
+                    <Button x:Name="CopyReproButton" Content="&#x1F4CB; Copy Repro"
                             Click="CopyRepro_Click"
                             Height="28" Padding="10,0" FontSize="12" IsEnabled="False"
                             Theme="{StaticResource AppButton}"
                             ToolTip.Tip="Copy reproduction script to clipboard"/>
-                    <Button x:Name="GetActualPlanButton" Content="&#x25B6; Run Repro Script"
+                    <Button x:Name="GetActualPlanButton" Content="&#x25B6; Run Repro"
                             Click="GetActualPlan_Click"
                             Height="28" Padding="10,0" FontSize="12" IsEnabled="False"
                             Theme="{StaticResource AppButton}"
diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
index 7311a70..d0f0fd4 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Text.Json;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml.Linq;
@@ -132,9 +133,25 @@ private void SetupEditorContextMenu()
             QueryEditor.SelectAll();
         };
 
+        var executeFromCursorItem = new MenuItem { Header = "Execute from Cursor" };
+        executeFromCursorItem.Click += async (_, _) =>
+        {
+            var text = GetTextFromCursor();
+            if (!string.IsNullOrWhiteSpace(text))
+                await CaptureAndShowPlan(estimated: false, queryTextOverride: text);
+        };
+
+        var executeCurrentBatchItem = new MenuItem { Header = "Execute Current Batch" };
+        executeCurrentBatchItem.Click += async (_, _) =>
+        {
+            var text = GetCurrentBatch();
+            if (!string.IsNullOrWhiteSpace(text))
+                await CaptureAndShowPlan(estimated: false, queryTextOverride: text);
+        };
+
         QueryEditor.TextArea.ContextMenu = new ContextMenu
         {
-            Items = { cutItem, copyItem, pasteItem, new Separator(), selectAllItem }
+            Items = { cutItem, copyItem, pasteItem, new Separator(), selectAllItem, new Separator(), executeFromCursorItem, executeCurrentBatchItem }
         };
     }
 
@@ -154,6 +171,12 @@ private void OnKeyDown(object? sender, KeyEventArgs e)
             ExecuteEstimated_Click(this, new RoutedEventArgs());
             e.Handled = true;
         }
+        // Escape → Cancel running query
+        else if (e.Key == Key.Escape && _executionCts != null && !_executionCts.IsCancellationRequested)
+        {
+            _executionCts.Cancel();
+            e.Handled = true;
+        }
     }
 
     private void OnEditorPointerWheel(object? sender, PointerWheelEventArgs e)
@@ -253,6 +276,47 @@ private void OnTextEntered(object? sender, TextInputEventArgs e)
         return (doc.GetText(start, offset - start), start);
     }
 
+    private string? GetSelectedTextOrNull()
+    {
+        var selection = QueryEditor.TextArea.Selection;
+        if (selection.IsEmpty) return null;
+        return selection.GetText();
+    }
+
+    private string GetTextFromCursor()
+    {
+        var doc = QueryEditor.Document;
+        var offset = QueryEditor.CaretOffset;
+        return doc.GetText(offset, doc.TextLength - offset);
+    }
+
+    private string? GetCurrentBatch()
+    {
+        var doc = QueryEditor.Document;
+        var caretOffset = QueryEditor.CaretOffset;
+        var text = doc.Text;
+        var goPattern = new Regex(@"^\s*GO\s*$", RegexOptions.IgnoreCase | RegexOptions.Multiline);
+        var matches = goPattern.Matches(text);
+
+        int batchStart = 0;
+        int batchEnd = text.Length;
+
+        foreach (Match m in matches)
+        {
+            if (m.Index + m.Length <= caretOffset)
+            {
+                batchStart = m.Index + m.Length;
+            }
+            else if (m.Index >= caretOffset)
+            {
+                batchEnd = m.Index;
+                break;
+            }
+        }
+
+        return text[batchStart..batchEnd].Trim();
+    }
+
     private void SetStatus(string text, bool autoClear = true)
     {
         _statusClearCts?.Cancel();
@@ -429,7 +493,7 @@ private async void ExecuteEstimated_Click(object? sender, RoutedEventArgs e)
         await CaptureAndShowPlan(estimated: true);
     }
 
-    private async Task CaptureAndShowPlan(bool estimated)
+    private async Task CaptureAndShowPlan(bool estimated, string? queryTextOverride = null)
     {
         if (_connectionString == null || _selectedDatabase == null)
         {
@@ -437,7 +501,9 @@ private async Task CaptureAndShowPlan(bool estimated)
             return;
         }
 
-        var queryText = QueryEditor.Text?.Trim();
+        var queryText = queryTextOverride?.Trim()
+                        ?? GetSelectedTextOrNull()?.Trim()
+                        ?? QueryEditor.Text?.Trim();
         if (string.IsNullOrEmpty(queryText))
         {
             SetStatus("Enter a query", autoClear: false);
@@ -448,10 +514,96 @@ private async Task CaptureAndShowPlan(bool estimated)
         _executionCts = new CancellationTokenSource();
         var ct = _executionCts.Token;
 
-        var planType = estimated ? "estimated" : "actual";
-        SetStatus($"Capturing {planType} plan...");
-        ExecuteButton.IsEnabled = false;
-        ExecuteEstButton.IsEnabled = false;
+        var planType = estimated ? "Estimated" : "Actual";
+
+        // Create loading tab with cancel button
+        var loadingPanel = new StackPanel
+        {
+            VerticalAlignment = VerticalAlignment.Center,
+            HorizontalAlignment = HorizontalAlignment.Center,
+            Width = 300
+        };
+
+        var progressBar = new ProgressBar
+        {
+            IsIndeterminate = true,
+            Height = 4,
+            Margin = new Avalonia.Thickness(0, 0, 0, 12)
+        };
+
+        var statusLabel = new TextBlock
+        {
+            Text = $"Capturing {planType.ToLower()} plan...",
+            FontSize = 14,
+            Foreground = new SolidColorBrush(Color.Parse("#B0B6C0")),
+            HorizontalAlignment = HorizontalAlignment.Center
+        };
+
+        var cancelBtn = new Button
+        {
+            Content = "\u25A0 Cancel",
+            Height = 32,
+            Width = 120,
+            Padding = new Avalonia.Thickness(16, 0),
+            FontSize = 13,
+            Margin = new Avalonia.Thickness(0, 16, 0, 0),
+            HorizontalAlignment = HorizontalAlignment.Center,
+            HorizontalContentAlignment = HorizontalAlignment.Center,
+            VerticalContentAlignment = VerticalAlignment.Center,
+            Theme = (Avalonia.Styling.ControlTheme)this.FindResource("AppButton")!
+        };
+        cancelBtn.Click += (_, _) => _executionCts?.Cancel();
+
+        loadingPanel.Children.Add(progressBar);
+        loadingPanel.Children.Add(statusLabel);
+        loadingPanel.Children.Add(cancelBtn);
+
+        var loadingContainer = new Grid
+        {
+            Background = new SolidColorBrush(Color.Parse("#1A1D23")),
+            Focusable = true,
+            Children = { loadingPanel }
+        };
+        loadingContainer.KeyDown += (_, ke) =>
+        {
+            if (ke.Key == Key.Escape) { _executionCts?.Cancel(); ke.Handled = true; }
+        };
+
+        // Add loading tab and switch to it
+        _planCounter++;
+        var tabLabel = estimated ? $"Est Plan {_planCounter}" : $"Plan {_planCounter}";
+        var headerText = new TextBlock
+        {
+            Text = tabLabel,
+            VerticalAlignment = VerticalAlignment.Center,
+            FontSize = 12
+        };
+        var closeBtn = new Button
+        {
+            Content = "\u2715",
+            MinWidth = 22, MinHeight = 22, Width = 22, Height = 22,
+            Padding = new Avalonia.Thickness(0),
+            FontSize = 11,
+            Margin = new Avalonia.Thickness(6, 0, 0, 0),
+            Background = Brushes.Transparent,
+            BorderThickness = new Avalonia.Thickness(0),
+            Foreground = new SolidColorBrush(Color.FromRgb(0xE4, 0xE6, 0xEB)),
+            VerticalAlignment = VerticalAlignment.Center,
+            HorizontalContentAlignment = HorizontalAlignment.Center,
+            VerticalContentAlignment = VerticalAlignment.Center
+        };
+        var header = new StackPanel
+        {
+            Orientation = Orientation.Horizontal,
+            Children = { headerText, closeBtn }
+        };
+        var loadingTab = new TabItem { Header = header, Content = loadingContainer };
+        closeBtn.Tag = loadingTab;
+        closeBtn.Click += ClosePlanTab_Click;
+
+        SubTabControl.Items.Add(loadingTab);
+        SubTabControl.SelectedItem = loadingTab;
+        loadingContainer.Focus();
 
         try
         {
@@ -466,45 +618,51 @@ private async Task CaptureAndShowPlan(bool estimated)
             if (estimated)
             {
                 planXml = await EstimatedPlanExecutor.GetEstimatedPlanAsync(
-                    _connectionString, _selectedDatabase, queryText, timeoutSeconds: 60, ct);
+                    _connectionString, _selectedDatabase, queryText, timeoutSeconds: 0, ct);
             }
             else
             {
                 planXml = await ActualPlanExecutor.ExecuteForActualPlanAsync(
                     _connectionString, _selectedDatabase, queryText,
                     planXml: null, isolationLevel: null,
-                    isAzureSqlDb: isAzure, timeoutSeconds: 60, ct);
+                    isAzureSqlDb: isAzure, timeoutSeconds: 0, ct);
             }
 
             sw.Stop();
 
             if (string.IsNullOrEmpty(planXml))
             {
-                SetStatus($"No plan returned ({sw.Elapsed.TotalSeconds:F1}s)");
+                statusLabel.Text = $"No plan returned ({sw.Elapsed.TotalSeconds:F1}s)";
+                progressBar.IsVisible = false;
+                cancelBtn.IsVisible = false;
                 return;
             }
 
+            // Replace loading content with the plan viewer
             SetStatus($"{planType} plan captured ({sw.Elapsed.TotalSeconds:F1}s)");
-            AddPlanTab(planXml, queryText, estimated);
+            var viewer = new PlanViewerControl();
+            viewer.Metadata = _serverMetadata;
+            viewer.LoadPlan(planXml, tabLabel, queryText);
+            loadingTab.Content = viewer;
             HumanAdviceButton.IsEnabled = true;
             RobotAdviceButton.IsEnabled = true;
         }
         catch (OperationCanceledException)
         {
             SetStatus("Cancelled");
+            SubTabControl.Items.Remove(loadingTab);
         }
         catch (SqlException ex)
         {
-            SetStatus(ex.Message.Length > 100 ? ex.Message[..100] + "..." : ex.Message, autoClear: false);
+            statusLabel.Text = ex.Message.Length > 100 ? ex.Message[..100] + "..." : ex.Message;
+            progressBar.IsVisible = false;
+            cancelBtn.IsVisible = false;
         }
         catch (Exception ex)
         {
-            SetStatus(ex.Message.Length > 100 ? ex.Message[..100] + "..." : ex.Message, autoClear: false);
-        }
-        finally
-        {
-            ExecuteButton.IsEnabled = true;
-            ExecuteEstButton.IsEnabled = true;
+            statusLabel.Text = ex.Message.Length > 100 ? ex.Message[..100] + "..." : ex.Message;
+            progressBar.IsVisible = false;
+            cancelBtn.IsVisible = false;
         }
     }
 
@@ -550,21 +708,11 @@ private void RobotAdvice_Click(object? sender, RoutedEventArgs e)
 
     private void ShowAdviceWindow(string title, string content)
     {
-        var textBox = new TextBox
-        {
-            Text = content,
-            IsReadOnly = true,
-            AcceptsReturn = true,
-            FontFamily = new FontFamily("Consolas, Menlo, monospace"),
-            FontSize = 12,
-            Background = Brushes.Transparent,
-            BorderThickness = new Avalonia.Thickness(0),
-            TextWrapping = TextWrapping.Wrap
-        };
+        var styledContent = AdviceContentBuilder.Build(content);
 
         var scrollViewer = new ScrollViewer
         {
-            Content = textBox,
+            Content = styledContent,
             HorizontalScrollBarVisibility = Avalonia.Controls.Primitives.ScrollBarVisibility.Disabled,
             VerticalScrollBarVisibility = Avalonia.Controls.Primitives.ScrollBarVisibility.Auto
         };
@@ -1174,8 +1322,93 @@ private async void GetActualPlan_Click(object? sender, RoutedEventArgs e)
         _executionCts = new CancellationTokenSource();
         var ct = _executionCts.Token;
 
-        SetStatus("Capturing actual plan...");
-        GetActualPlanButton.IsEnabled = false;
+        // Create loading tab with cancel button
+        var loadingPanel = new StackPanel
+        {
+            VerticalAlignment = VerticalAlignment.Center,
+            HorizontalAlignment = HorizontalAlignment.Center,
+            Width = 300
+        };
+
+        var progressBar = new ProgressBar
+        {
+            IsIndeterminate = true,
+            Height = 4,
+            Margin = new Avalonia.Thickness(0, 0, 0, 12)
+        };
+
+        var statusLabel = new TextBlock
+        {
+            Text = "Capturing actual plan...",
+            FontSize = 14,
+            Foreground = new SolidColorBrush(Color.Parse("#B0B6C0")),
+            HorizontalAlignment = HorizontalAlignment.Center
+        };
+
+        var cancelBtn = new Button
+        {
+            Content = "\u25A0 Cancel",
+            Height = 32,
+            Width = 120,
+            Padding = new Avalonia.Thickness(16, 0),
+            FontSize = 13,
+            Margin = new Avalonia.Thickness(0, 16, 0, 0),
+            HorizontalAlignment = HorizontalAlignment.Center,
+            HorizontalContentAlignment = HorizontalAlignment.Center,
+            VerticalContentAlignment = VerticalAlignment.Center,
+            Theme = (Avalonia.Styling.ControlTheme)this.FindResource("AppButton")!
+        };
+        cancelBtn.Click += (_, _) => _executionCts?.Cancel();
+
+        loadingPanel.Children.Add(progressBar);
+        loadingPanel.Children.Add(statusLabel);
+        loadingPanel.Children.Add(cancelBtn);
+
+        var loadingContainer = new Grid
+        {
+            Background = new SolidColorBrush(Color.Parse("#1A1D23")),
+            Focusable = true,
+            Children = { loadingPanel }
+        };
+        loadingContainer.KeyDown += (_, ke) =>
+        {
+            if (ke.Key == Key.Escape) { _executionCts?.Cancel(); ke.Handled = true; }
+        };
+
+        _planCounter++;
+        var tabLabel = $"Plan {_planCounter}";
+        var headerText = new TextBlock
+        {
+            Text = tabLabel,
+            VerticalAlignment = VerticalAlignment.Center,
+            FontSize = 12
+        };
+        var closeBtn = new Button
+        {
+            Content = "\u2715",
+            MinWidth = 22, MinHeight = 22, Width = 22, Height = 22,
+            Padding = new Avalonia.Thickness(0),
+            FontSize = 11,
+            Margin = new Avalonia.Thickness(6, 0, 0, 0),
+            Background = Brushes.Transparent,
+            BorderThickness = new Avalonia.Thickness(0),
+            Foreground = new SolidColorBrush(Color.FromRgb(0xE4, 0xE6, 0xEB)),
+            VerticalAlignment = VerticalAlignment.Center,
+            HorizontalContentAlignment = HorizontalAlignment.Center,
+            VerticalContentAlignment = VerticalAlignment.Center
+        };
+        var header = new StackPanel
+        {
+            Orientation = Orientation.Horizontal,
+            Children = { headerText, closeBtn }
+        };
+        var loadingTab = new TabItem { Header = header, Content = loadingContainer };
+        closeBtn.Tag = loadingTab;
+        closeBtn.Click += ClosePlanTab_Click;
+
+        SubTabControl.Items.Add(loadingTab);
+        SubTabControl.SelectedItem = loadingTab;
+        loadingContainer.Focus();
 
         try
         {
@@ -1185,30 +1418,40 @@ private async void GetActualPlan_Click(object? sender, RoutedEventArgs e)
             var actualPlanXml = await ActualPlanExecutor.ExecuteForActualPlanAsync(
                 _connectionString, _selectedDatabase, queryText,
                 planXml, isolationLevel: null,
-                isAzureSqlDb: isAzure, timeoutSeconds: 60, ct);
+                isAzureSqlDb: isAzure, timeoutSeconds: 0, ct);
 
             sw.Stop();
 
             if (string.IsNullOrEmpty(actualPlanXml))
             {
-                SetStatus($"No actual plan returned ({sw.Elapsed.TotalSeconds:F1}s)");
+                statusLabel.Text = $"No actual plan returned ({sw.Elapsed.TotalSeconds:F1}s)";
+                progressBar.IsVisible = false;
+                cancelBtn.IsVisible = false;
                 return;
             }
 
             SetStatus($"Actual plan captured ({sw.Elapsed.TotalSeconds:F1}s)");
-            AddPlanTab(actualPlanXml, queryText, estimated: false);
+            var actualViewer = new PlanViewerControl();
+            actualViewer.Metadata = _serverMetadata;
+            actualViewer.LoadPlan(actualPlanXml, tabLabel, queryText);
+            loadingTab.Content = actualViewer;
         }
         catch (OperationCanceledException)
         {
             SetStatus("Cancelled");
+            SubTabControl.Items.Remove(loadingTab);
         }
         catch (SqlException ex)
         {
-            SetStatus(ex.Message.Length > 100 ? ex.Message[..100] + "..." : ex.Message, autoClear: false);
+            statusLabel.Text = ex.Message.Length > 100 ? ex.Message[..100] + "..." : ex.Message;
+            progressBar.IsVisible = false;
+            cancelBtn.IsVisible = false;
         }
         catch (Exception ex)
         {
-            SetStatus(ex.Message.Length > 100 ? ex.Message[..100] + "..." : ex.Message, autoClear: false);
+            statusLabel.Text = ex.Message.Length > 100 ? ex.Message[..100] + "..." : ex.Message;
+            progressBar.IsVisible = false;
+            cancelBtn.IsVisible = false;
         }
         finally
         {
diff --git a/src/PlanViewer.App/Info.plist b/src/PlanViewer.App/Info.plist
index 49ec93f..2cd39e7 100644
--- a/src/PlanViewer.App/Info.plist
+++ b/src/PlanViewer.App/Info.plist
@@ -8,10 +8,12 @@
     <string>Performance Studio</string>
     <key>CFBundleIdentifier</key>
     <string>com.darlingdata.sqlperformancestudio</string>
+    <key>CFBundleExecutable</key>
+    <string>PlanViewer.App</string>
     <key>CFBundleVersion</key>
-    <string>0.7.0</string>
+    <string>1.0.0</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.7.0</string>
+    <string>1.0.0</string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>NSHumanReadableCopyright</key>
diff --git a/src/PlanViewer.App/MainWindow.axaml.cs b/src/PlanViewer.App/MainWindow.axaml.cs
index 15cad87..bc9d8a1 100644
--- a/src/PlanViewer.App/MainWindow.axaml.cs
+++ b/src/PlanViewer.App/MainWindow.axaml.cs
@@ -351,6 +351,7 @@ private void LoadPlanFile(string filePath)
 
             var viewer = new PlanViewerControl();
             viewer.LoadPlan(xml, fileName);
+            viewer.SourceFilePath = filePath;
 
             // Wrap viewer with advice toolbar
             var content = CreatePlanTabContent(viewer);
@@ -418,7 +419,7 @@ private DockPanel CreatePlanTabContent(PlanViewerControl viewer)
     {
         var humanBtn = new Button
         {
-            Content = "\U0001f9d1 Advice for Humans",
+            Content = "\U0001f9d1 Human Advice",
             Height = 28,
             Padding = new Avalonia.Thickness(10, 0),
             FontSize = 12,
@@ -430,7 +431,7 @@ private DockPanel CreatePlanTabContent(PlanViewerControl viewer)
 
         var robotBtn = new Button
         {
-            Content = "\U0001f916 Advice for Robots",
+            Content = "\U0001f916 Robot Advice",
             Height = 28,
             Padding = new Avalonia.Thickness(10, 0),
             FontSize = 12,
@@ -478,7 +479,7 @@ private DockPanel CreatePlanTabContent(PlanViewerControl viewer)
 
         var copyReproBtn = new Button
         {
-            Content = "\U0001f4cb Copy Repro Script",
+            Content = "\U0001f4cb Copy Repro",
             Height = 28,
             Padding = new Avalonia.Thickness(10, 0),
             FontSize = 12,
@@ -508,7 +509,7 @@ private DockPanel CreatePlanTabContent(PlanViewerControl viewer)
 
         var getActualPlanBtn = new Button
         {
-            Content = "\u25b6 Run Repro Script",
+            Content = "\u25b6 Run Repro",
             Height = 28,
             Padding = new Avalonia.Thickness(10, 0),
             FontSize = 12,
@@ -523,11 +524,33 @@ private DockPanel CreatePlanTabContent(PlanViewerControl viewer)
             await GetActualPlanFromFile(viewer);
         };
 
+        var separator2 = new TextBlock
+        {
+            Text = "|",
+            VerticalAlignment = VerticalAlignment.Center,
+            Foreground = new SolidColorBrush(Color.Parse("#E4E6EB")),
+            Margin = new Avalonia.Thickness(4, 0)
+        };
+
+        var queryStoreBtn = new Button
+        {
+            Content = "\U0001f4ca Query Store",
+            Height = 28,
+            Padding = new Avalonia.Thickness(10, 0),
+            FontSize = 12,
+            Margin = new Avalonia.Thickness(6, 0, 0, 0),
+            VerticalContentAlignment = VerticalAlignment.Center,
+            HorizontalContentAlignment = HorizontalAlignment.Center,
+            IsEnabled = false,
+            Theme = (Avalonia.Styling.ControlTheme)this.FindResource("AppButton")!
+        };
+        ToolTip.SetTip(queryStoreBtn, "Connect to a server (Ctrl+N) to use Query Store");
+
         var toolbar = new StackPanel
         {
             Orientation = Orientation.Horizontal,
             Margin = new Avalonia.Thickness(8, 6),
-            Children = { humanBtn, robotBtn, compareBtn, separator1, copyReproBtn, getActualPlanBtn }
+            Children = { humanBtn, robotBtn, compareBtn, separator1, copyReproBtn, getActualPlanBtn, separator2, queryStoreBtn }
         };
 
         var panel = new DockPanel();
@@ -540,21 +563,11 @@ private DockPanel CreatePlanTabContent(PlanViewerControl viewer)
 
     private void ShowAdviceWindow(string title, string content)
     {
-        var textBox = new TextBox
-        {
-            Text = content,
-            IsReadOnly = true,
-            AcceptsReturn = true,
-            FontFamily = new FontFamily("Consolas, Menlo, monospace"),
-            FontSize = 12,
-            Background = Brushes.Transparent,
-            BorderThickness = new Avalonia.Thickness(0),
-            TextWrapping = TextWrapping.Wrap
-        };
+        var styledContent = AdviceContentBuilder.Build(content);
 
         var scrollViewer = new ScrollViewer
         {
-            Content = textBox,
+            Content = styledContent,
             HorizontalScrollBarVisibility = Avalonia.Controls.Primitives.ScrollBarVisibility.Disabled,
             VerticalScrollBarVisibility = Avalonia.Controls.Primitives.ScrollBarVisibility.Auto
         };
@@ -847,11 +860,17 @@ private TabItem CreateTab(string label, Control content)
         closeBtn.Click += CloseTab_Click;
 
         // Right-click context menu
+        var copyPathItem = new MenuItem { Header = "Copy Path", Tag = tab };
+        // Only visible when tab content has a file path
+        var filePath = GetTabFilePath(tab);
+        copyPathItem.IsVisible = filePath != null;
+
         var contextMenu = new ContextMenu
         {
             Items =
             {
                 new MenuItem { Header = "Rename Tab", Tag = new object[] { header, headerText } },
+                copyPathItem,
                 new Separator(),
                 new MenuItem { Header = "Close", Tag = tab, InputGesture = new KeyGesture(Key.W, KeyModifiers.Control) },
                 new MenuItem { Header = "Close Other Tabs", Tag = tab },
@@ -889,6 +908,15 @@ private void TabContextMenu_Click(object? sender, RoutedEventArgs e)
                     StartRename((StackPanel)parts[0], (TextBlock)parts[1]);
                 break;
 
+            case "Copy Path":
+                if (item.Tag is TabItem pathTab)
+                {
+                    var path = GetTabFilePath(pathTab);
+                    if (path != null)
+                        _ = this.Clipboard?.SetTextAsync(path);
+                }
+                break;
+
             case "Close":
                 if (item.Tag is TabItem tab)
                 {
@@ -915,6 +943,20 @@ private void TabContextMenu_Click(object? sender, RoutedEventArgs e)
         }
     }
 
+    private static string? GetTabFilePath(TabItem tab)
+    {
+        // Plans opened from file are wrapped in a DockPanel with the viewer as the last child
+        if (tab.Content is DockPanel dp)
+        {
+            foreach (var child in dp.Children)
+            {
+                if (child is PlanViewerControl v)
+                    return v.SourceFilePath;
+            }
+        }
+        return null;
+    }
+
     private void StartRename(StackPanel header, TextBlock headerText)
     {
         var textBox = new TextBox
@@ -1045,19 +1087,43 @@ private async Task GetActualPlanFromFile(PlanViewerControl viewer)
             HorizontalAlignment = HorizontalAlignment.Center
         };
 
+        var cancelBtn = new Button
+        {
+            Content = "\u25A0 Cancel",
+            Height = 32,
+            Width = 120,
+            Padding = new Avalonia.Thickness(16, 0),
+            FontSize = 13,
+            Margin = new Avalonia.Thickness(0, 16, 0, 0),
+            HorizontalAlignment = HorizontalAlignment.Center,
+            HorizontalContentAlignment = HorizontalAlignment.Center,
+            VerticalContentAlignment = VerticalAlignment.Center,
+            Theme = (Avalonia.Styling.ControlTheme)this.FindResource("AppButton")!
+        };
+
         loadingPanel.Children.Add(progressBar);
         loadingPanel.Children.Add(statusText);
+        loadingPanel.Children.Add(cancelBtn);
+
+        var cts = new System.Threading.CancellationTokenSource();
+        cancelBtn.Click += (_, _) => cts.Cancel();
 
         var loadingContainer = new Grid
         {
             Background = new SolidColorBrush(Color.Parse("#1A1D23")),
+            Focusable = true,
             Children = { loadingPanel }
         };
+        loadingContainer.KeyDown += (_, ke) =>
+        {
+            if (ke.Key == Avalonia.Input.Key.Escape) { cts.Cancel(); ke.Handled = true; }
+        };
 
         var tab = CreateTab("Actual Plan", loadingContainer);
         MainTabControl.Items.Add(tab);
         MainTabControl.SelectedItem = tab;
         UpdateEmptyOverlay();
+        loadingContainer.Focus();
 
         try
         {
@@ -1074,13 +1140,12 @@ private async Task GetActualPlanFromFile(PlanViewerControl viewer)
 
             statusText.Text = "Capturing actual plan...";
 
-            var cts = new System.Threading.CancellationTokenSource();
             var sw = System.Diagnostics.Stopwatch.StartNew();
 
             var actualPlanXml = await ActualPlanExecutor.ExecuteForActualPlanAsync(
                 connectionString, database, queryText,
                 viewer.RawXml, isolationLevel: null,
-                isAzureSqlDb: isAzure, timeoutSeconds: 60, cts.Token);
+                isAzureSqlDb: isAzure, timeoutSeconds: 0, cts.Token);
 
             sw.Stop();
 
diff --git a/src/PlanViewer.App/PlanViewer.App.csproj b/src/PlanViewer.App/PlanViewer.App.csproj
index 0f5548a..0cea721 100644
--- a/src/PlanViewer.App/PlanViewer.App.csproj
+++ b/src/PlanViewer.App/PlanViewer.App.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-    <Version>0.9.0</Version>
+    <Version>1.0.0</Version>
     <Authors>Erik Darling</Authors>
     <Company>Darling Data LLC</Company>
     <Product>Performance Studio</Product>
diff --git a/src/PlanViewer.App/Services/AdviceContentBuilder.cs b/src/PlanViewer.App/Services/AdviceContentBuilder.cs
new file mode 100644
index 0000000..35f1c37
--- /dev/null
+++ b/src/PlanViewer.App/Services/AdviceContentBuilder.cs
@@ -0,0 +1,593 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Controls;
+using Avalonia.Controls.Documents;
+using Avalonia.Media;
+
+namespace PlanViewer.App.Services;
+
+/// <summary>
+/// Builds styled content for the Advice for Humans window.
+/// Shared between MainWindow (file mode) and QuerySessionControl (query mode).
+/// </summary>
+internal static class AdviceContentBuilder
+{
+    private static readonly SolidColorBrush HeaderBrush = new(Color.Parse("#4FA3FF"));
+    private static readonly SolidColorBrush CriticalBrush = new(Color.Parse("#E57373"));
+    private static readonly SolidColorBrush WarningBrush = new(Color.Parse("#FFB347"));
+    private static readonly SolidColorBrush InfoBrush = new(Color.Parse("#6BB5FF"));
+    private static readonly SolidColorBrush LabelBrush = new(Color.Parse("#9B9EC0"));
+    private static readonly SolidColorBrush ValueBrush = new(Color.Parse("#E4E6EB"));
+    private static readonly SolidColorBrush CodeBrush = new(Color.Parse("#7BCF7B"));
+    private static readonly SolidColorBrush MutedBrush = new(Color.Parse("#8B8FA0"));
+    private static readonly SolidColorBrush OperatorBrush = new(Color.Parse("#C792EA"));
+    private static readonly SolidColorBrush SqlKeywordBrush = new(Color.Parse("#569CD6"));
+    private static readonly SolidColorBrush SeparatorBrush = new(Color.Parse("#2A2D35"));
+    private static readonly SolidColorBrush WarningAccentBrush = new(Color.Parse("#332A1A"));
+    private static readonly FontFamily MonoFont = new("Consolas, Menlo, monospace");
+
+    private static readonly HashSet<string> PhysicalOperators = new(StringComparer.OrdinalIgnoreCase)
+    {
+        "Sort", "Filter", "Bitmap", "Hash Match", "Merge Join", "Nested Loops",
+        "Stream Aggregate", "Compute Scalar", "Table Scan", "Index Scan",
+        "Clustered Index Scan", "Table Spool", "Index Spool", "Constant Scan",
+        "Concatenation", "Assert", "Segment", "Sequence Project", "Window Aggregate",
+        "Adaptive Join", "Row Count Spool", "Lazy Spool", "Eager Spool",
+        "Columnstore Index Scan", "Batch Hash Table Build", "Parallelism",
+        "Top", "Index Seek", "Clustered Index Seek", "RID Lookup",
+        "Key Lookup", "Clustered Index Update", "Clustered Index Insert",
+        "Clustered Index Delete", "Table Insert", "Table Delete"
+    };
+
+    private static readonly HashSet<string> SqlKeywords = new(StringComparer.OrdinalIgnoreCase)
+    {
+        "SELECT", "FROM", "WHERE", "JOIN", "LEFT", "RIGHT", "INNER", "OUTER", "CROSS",
+        "ON", "AND", "OR", "NOT", "IN", "EXISTS", "BETWEEN", "LIKE", "IS", "NULL",
+        "INSERT", "INTO", "UPDATE", "SET", "DELETE", "MERGE", "USING", "MATCHED",
+        "GROUP", "BY", "ORDER", "HAVING", "UNION", "ALL", "EXCEPT", "INTERSECT",
+        "TOP", "DISTINCT", "AS", "WITH", "CTE", "OVER", "PARTITION", "ROW_NUMBER",
+        "CASE", "WHEN", "THEN", "ELSE", "END", "CAST", "CONVERT", "COALESCE",
+        "CREATE", "ALTER", "DROP", "INDEX", "TABLE", "VIEW", "PROCEDURE", "FUNCTION",
+        "EXEC", "EXECUTE", "DECLARE", "BEGIN", "RETURN", "IF", "WHILE",
+        "ASC", "DESC", "OFFSET", "FETCH", "NEXT", "ROWS", "ONLY",
+        "COUNT", "SUM", "AVG", "MIN", "MAX", "APPLY", "PIVOT", "UNPIVOT",
+        "NONCLUSTERED", "CLUSTERED", "INCLUDE", "OPTION", "RECOMPILE", "MAXDOP",
+        "NOLOCK", "READUNCOMMITTED", "READCOMMITTED", "SERIALIZABLE", "HOLDLOCK"
+    };
+
+    public static StackPanel Build(string content)
+    {
+        var panel = new StackPanel { Margin = new Avalonia.Thickness(4, 0) };
+        var lines = content.Split('\n');
+        var inCodeBlock = false;
+        var codeBlockIndent = 0;
+        var isStatementText = false;
+        var inSubSection = false; // tracks sub-sections within a statement
+
+        for (int i = 0; i < lines.Length; i++)
+        {
+            var line = lines[i].TrimEnd('\r');
+
+            // Empty lines — small spacer
+            if (string.IsNullOrWhiteSpace(line))
+            {
+                panel.Children.Add(new Border { Height = 6 });
+                inCodeBlock = false;
+                isStatementText = false;
+                inSubSection = false;
+                continue;
+            }
+
+            // Section headers: === ... ===
+            if (line.StartsWith("===") && line.EndsWith("==="))
+            {
+                inCodeBlock = false;
+                isStatementText = false;
+                inSubSection = false;
+
+                // Strip === markers, just show the text
+                var headerText = line.Trim('=', ' ');
+
+                // Add separator before non-first headers
+                if (panel.Children.Count > 0)
+                {
+                    panel.Children.Add(new Border
+                    {
+                        Height = 1,
+                        Background = SeparatorBrush,
+                        Margin = new Avalonia.Thickness(0, 10, 0, 6)
+                    });
+                }
+
+                panel.Children.Add(new SelectableTextBlock
+                {
+                    Text = headerText,
+                    FontFamily = MonoFont,
+                    FontSize = 14,
+                    FontWeight = FontWeight.Bold,
+                    Foreground = HeaderBrush,
+                    Margin = new Avalonia.Thickness(0, 0, 0, 6),
+                    TextWrapping = TextWrapping.Wrap
+                });
+
+                // Statement text follows "Statement N:"
+                if (headerText.StartsWith("Statement"))
+                    isStatementText = true;
+
+                continue;
+            }
+
+            // Statement text (SQL) — highlight keywords
+            if (isStatementText)
+            {
+                isStatementText = false;
+                panel.Children.Add(BuildSqlHighlightedLine(line));
+                continue;
+            }
+
+            // Warning lines: [Critical], [Warning], [Info] — with left accent border
+            if (line.Contains("[Critical]"))
+            {
+                panel.Children.Add(CreateWarningBlock(line, CriticalBrush));
+                continue;
+            }
+            if (line.Contains("[Warning]"))
+            {
+                panel.Children.Add(CreateWarningBlock(line, WarningBrush));
+                continue;
+            }
+            if (line.Contains("[Info]"))
+            {
+                panel.Children.Add(CreateWarningBlock(line, InfoBrush));
+                continue;
+            }
+
+            var trimmed = line.TrimStart();
+
+            // Grouped explanation line: "  -> The overestimate may have..."
+            if (trimmed.StartsWith("-> "))
+            {
+                panel.Children.Add(new SelectableTextBlock
+                {
+                    Text = trimmed[3..],
+                    FontFamily = MonoFont,
+                    FontSize = 12,
+                    FontStyle = Avalonia.Media.FontStyle.Italic,
+                    Foreground = MutedBrush,
+                    Margin = new Avalonia.Thickness(16, 2, 0, 4),
+                    TextWrapping = TextWrapping.Wrap
+                });
+                continue;
+            }
+
+            // SNIFFING marker
+            if (line.Contains("[SNIFFING]"))
+            {
+                var tb = new SelectableTextBlock
+                {
+                    FontFamily = MonoFont,
+                    FontSize = 12,
+                    TextWrapping = TextWrapping.Wrap,
+                    Margin = new Avalonia.Thickness(8, 1, 0, 1)
+                };
+                var sniffIdx = line.IndexOf("[SNIFFING]");
+                tb.Inlines!.Add(new Run(line[..sniffIdx].TrimStart()) { Foreground = ValueBrush });
+                tb.Inlines.Add(new Run("[SNIFFING]")
+                    { Foreground = CriticalBrush, FontWeight = FontWeight.SemiBold });
+                panel.Children.Add(tb);
+                continue;
+            }
+
+            // CREATE INDEX lines (multi-line: CREATE..., ON..., INCLUDE..., WHERE...)
+            if (trimmed.StartsWith("CREATE", StringComparison.OrdinalIgnoreCase))
+            {
+                inCodeBlock = true;
+                codeBlockIndent = line.Length - trimmed.Length;
+            }
+            else if (inCodeBlock)
+            {
+                if (trimmed.StartsWith("ON ", StringComparison.OrdinalIgnoreCase) ||
+                    trimmed.StartsWith("INCLUDE ", StringComparison.OrdinalIgnoreCase) ||
+                    trimmed.StartsWith("WHERE ", StringComparison.OrdinalIgnoreCase) ||
+                    trimmed.StartsWith("WITH ", StringComparison.OrdinalIgnoreCase))
+                { /* still in code block */ }
+                else
+                    inCodeBlock = false;
+            }
+
+            if (inCodeBlock)
+            {
+                var currentIndent = line.Length - trimmed.Length;
+                var displayLine = currentIndent < codeBlockIndent
+                    ? new string(' ', codeBlockIndent) + trimmed
+                    : line;
+
+                panel.Children.Add(new SelectableTextBlock
+                {
+                    Text = displayLine,
+                    FontFamily = MonoFont,
+                    FontSize = 12,
+                    Foreground = CodeBrush,
+                    TextWrapping = TextWrapping.Wrap,
+                    Margin = new Avalonia.Thickness(8, 1, 0, 1)
+                });
+                continue;
+            }
+
+            // Expensive operator timing lines: "4,616ms CPU (61%), 586ms elapsed (62%)"
+            // Must start with a digit to avoid catching "Runtime: 1,234ms elapsed, 1,200ms CPU"
+            if ((trimmed.Contains("ms CPU") || trimmed.Contains("ms elapsed"))
+                && trimmed.Length > 0 && char.IsDigit(trimmed[0]))
+            {
+                panel.Children.Add(CreateOperatorTimingLine(trimmed));
+                continue;
+            }
+
+            // Expensive operators section: highlight operator name
+            // Handles both "Operator (Object):" and bare "Sort:" forms
+            if (trimmed.EndsWith("):") ||
+                (trimmed.EndsWith(":") && PhysicalOperators.Contains(trimmed[..^1])))
+            {
+                panel.Children.Add(CreateOperatorLine(line));
+                continue;
+            }
+
+            // Sub-section labels within a statement: "Warnings:", "Parameters:", "Wait stats:", etc.
+            // These have a space or end with ":" after trimming
+            if (IsSubSectionLabel(trimmed))
+            {
+                inSubSection = true;
+                panel.Children.Add(new SelectableTextBlock
+                {
+                    Text = "  " + trimmed,
+                    FontFamily = MonoFont,
+                    FontSize = 12,
+                    FontWeight = FontWeight.SemiBold,
+                    Foreground = LabelBrush,
+                    Margin = new Avalonia.Thickness(0, 6, 0, 2),
+                    TextWrapping = TextWrapping.Wrap
+                });
+                continue;
+            }
+
+            // Bullet lines: "   * ..."
+            if (trimmed.StartsWith("* "))
+            {
+                panel.Children.Add(new SelectableTextBlock
+                {
+                    Text = line,
+                    FontFamily = MonoFont,
+                    FontSize = 12,
+                    Foreground = MutedBrush,
+                    Margin = new Avalonia.Thickness(8, 1, 0, 1),
+                    TextWrapping = TextWrapping.Wrap
+                });
+                continue;
+            }
+
+            // Wait stats lines: "  WAITTYPE: 1,234ms" — color by category
+            if (trimmed.Contains("ms") && trimmed.Contains(':'))
+            {
+                var waitColon = trimmed.IndexOf(':');
+                if (waitColon > 0 && waitColon < trimmed.Length - 1)
+                {
+                    var waitName = trimmed[..waitColon];
+                    var waitValue = trimmed[(waitColon + 1)..].Trim();
+                    if (waitValue.EndsWith("ms") && waitName == waitName.ToUpperInvariant() && !waitName.Contains(' '))
+                    {
+                        panel.Children.Add(CreateWaitStatLine(waitName, waitValue, inSubSection));
+                        continue;
+                    }
+                }
+            }
+
+            // Key-value lines: "Label: value"
+            var colonIdx = line.IndexOf(':');
+            if (colonIdx > 0 && colonIdx < line.Length - 1)
+            {
+                var labelPart = line[..colonIdx].TrimStart();
+                if (labelPart.Length < 40 && !labelPart.Contains('(') && !labelPart.Contains('='))
+                {
+                    var indent = inSubSection ? 8.0 : 0.0;
+                    var tb = new SelectableTextBlock
+                    {
+                        FontFamily = MonoFont,
+                        FontSize = 12,
+                        TextWrapping = TextWrapping.Wrap,
+                        Margin = new Avalonia.Thickness(indent, 1, 0, 1)
+                    };
+                    tb.Inlines!.Add(new Run(labelPart + ":") { Foreground = LabelBrush });
+                    tb.Inlines.Add(new Run(line[(colonIdx + 1)..]) { Foreground = ValueBrush });
+                    panel.Children.Add(tb);
+                    continue;
+                }
+            }
+
+            // Default: regular text
+            panel.Children.Add(new SelectableTextBlock
+            {
+                Text = line,
+                FontFamily = MonoFont,
+                FontSize = 12,
+                Foreground = ValueBrush,
+                TextWrapping = TextWrapping.Wrap,
+                Margin = new Avalonia.Thickness(0, 1)
+            });
+        }
+
+        return panel;
+    }
+
+    private static bool IsSubSectionLabel(string trimmed)
+    {
+        // "Warnings:", "Parameters:", "Wait stats:", "Operator warnings:",
+        // "Missing indexes:", "Expensive operators:"
+        if (!trimmed.EndsWith(":")) return false;
+        var label = trimmed[..^1];
+        // Sub-section labels are short, may contain spaces, and are all-alpha
+        return label.Length < 30 && !label.Contains('=') && !label.Contains('(');
+    }
+
+    private static SelectableTextBlock BuildSqlHighlightedLine(string line)
+    {
+        var tb = new SelectableTextBlock
+        {
+            FontFamily = MonoFont,
+            FontSize = 12,
+            TextWrapping = TextWrapping.Wrap,
+            Margin = new Avalonia.Thickness(4, 1, 0, 1)
+        };
+
+        int pos = 0;
+        var text = line.TrimStart();
+        while (pos < text.Length)
+        {
+            if (!char.IsLetterOrDigit(text[pos]) && text[pos] != '_')
+            {
+                int start = pos;
+                while (pos < text.Length && !char.IsLetterOrDigit(text[pos]) && text[pos] != '_')
+                    pos++;
+                tb.Inlines!.Add(new Run(text[start..pos]) { Foreground = ValueBrush });
+                continue;
+            }
+
+            int wordStart = pos;
+            while (pos < text.Length && (char.IsLetterOrDigit(text[pos]) || text[pos] == '_'))
+                pos++;
+            var word = text[wordStart..pos];
+
+            if (SqlKeywords.Contains(word))
+                tb.Inlines!.Add(new Run(word) { Foreground = SqlKeywordBrush, FontWeight = FontWeight.SemiBold });
+            else
+                tb.Inlines!.Add(new Run(word) { Foreground = ValueBrush });
+        }
+
+        return tb;
+    }
+
+    /// <summary>
+    /// Creates a warning line with a left accent border for better scannability.
+    /// </summary>
+    private static Border CreateWarningBlock(string line, SolidColorBrush severityBrush)
+    {
+        var tb = new SelectableTextBlock
+        {
+            FontFamily = MonoFont,
+            FontSize = 12,
+            TextWrapping = TextWrapping.Wrap,
+            Margin = new Avalonia.Thickness(8, 2, 0, 2)
+        };
+
+        foreach (var tag in new[] { "[Critical]", "[Warning]", "[Info]" })
+        {
+            var idx = line.IndexOf(tag);
+            if (idx >= 0)
+            {
+                var afterTag = line[(idx + tag.Length)..].TrimStart();
+                // Extract "Type: Message" — show type in severity color, message in value
+                var typeColon = afterTag.IndexOf(':');
+                if (typeColon > 0)
+                {
+                    var typeName = afterTag[..typeColon];
+                    var message = afterTag[(typeColon + 1)..].TrimStart();
+                    tb.Inlines!.Add(new Run(tag + " ")
+                        { Foreground = severityBrush, FontWeight = FontWeight.SemiBold });
+                    tb.Inlines.Add(new Run(typeName)
+                        { Foreground = severityBrush });
+
+                    // Split on unit separator (U+001F) — TextFormatter encodes \n as \x1F
+                    // so multi-line messages survive the top-level line split in Build().
+                    var messageParts = message.Split('\x1F');
+                    for (int p = 0; p < messageParts.Length; p++)
+                    {
+                        var part = messageParts[p].Trim();
+                        if (string.IsNullOrEmpty(part))
+                            continue;
+
+                        if (part.StartsWith("Predicate:"))
+                        {
+                            tb.Inlines.Add(new Run("\n" + part[..10])
+                                { Foreground = LabelBrush });
+                            tb.Inlines.Add(new Run(part[10..])
+                                { Foreground = CodeBrush });
+                        }
+                        else if (p == 0)
+                        {
+                            // First line: the main description
+                            tb.Inlines.Add(new Run("\n" + part)
+                                { Foreground = ValueBrush });
+                        }
+                        else if (part.StartsWith("• "))
+                        {
+                            // Bullet stats: bullet in muted, value in white
+                            tb.Inlines.Add(new Run("\n  • ")
+                                { Foreground = MutedBrush });
+                            tb.Inlines.Add(new Run(part[2..])
+                                { Foreground = ValueBrush });
+                        }
+                        else if (part.StartsWith("CREATE ", StringComparison.OrdinalIgnoreCase)
+                            || part.StartsWith("ON ", StringComparison.OrdinalIgnoreCase)
+                            || part.StartsWith("INCLUDE ", StringComparison.OrdinalIgnoreCase)
+                            || part.StartsWith("WHERE ", StringComparison.OrdinalIgnoreCase))
+                        {
+                            // SQL DDL lines (CREATE INDEX, ON, INCLUDE, WHERE)
+                            tb.Inlines.Add(new Run("\n" + part)
+                                { Foreground = CodeBrush });
+                        }
+                        else
+                        {
+                            // Other detail lines
+                            tb.Inlines.Add(new Run("\n" + part)
+                                { Foreground = MutedBrush });
+                        }
+                    }
+                }
+                else
+                {
+                    tb.Inlines!.Add(new Run(tag)
+                        { Foreground = severityBrush, FontWeight = FontWeight.SemiBold });
+                    tb.Inlines.Add(new Run(" " + afterTag)
+                        { Foreground = ValueBrush });
+                }
+
+                return new Border
+                {
+                    BorderBrush = severityBrush,
+                    BorderThickness = new Avalonia.Thickness(2, 0, 0, 0),
+                    Padding = new Avalonia.Thickness(0),
+                    Margin = new Avalonia.Thickness(4, 2, 0, 2),
+                    Child = tb
+                };
+            }
+        }
+
+        tb.Text = line.TrimStart();
+        tb.Foreground = severityBrush;
+        return new Border
+        {
+            BorderBrush = severityBrush,
+            BorderThickness = new Avalonia.Thickness(2, 0, 0, 0),
+            Padding = new Avalonia.Thickness(0),
+            Margin = new Avalonia.Thickness(4, 2, 0, 2),
+            Child = tb
+        };
+    }
+
+    private static SelectableTextBlock CreateOperatorLine(string line)
+    {
+        var tb = new SelectableTextBlock
+        {
+            FontFamily = MonoFont,
+            FontSize = 12,
+            TextWrapping = TextWrapping.Wrap,
+            Margin = new Avalonia.Thickness(8, 2, 0, 0)
+        };
+
+        var trimmed = line.TrimStart();
+        var parenIdx = trimmed.LastIndexOf('(');
+
+        if (parenIdx > 0)
+        {
+            var opName = trimmed[..parenIdx].TrimEnd();
+            var rest = trimmed[parenIdx..];
+            tb.Inlines!.Add(new Run(opName) { Foreground = OperatorBrush, FontWeight = FontWeight.SemiBold });
+            tb.Inlines.Add(new Run(" " + rest) { Foreground = MutedBrush });
+        }
+        else
+        {
+            tb.Text = trimmed;
+            tb.Foreground = OperatorBrush;
+            tb.FontWeight = FontWeight.SemiBold;
+        }
+
+        return tb;
+    }
+
+    /// <summary>
+    /// Renders timing line like "4,616ms CPU (61%), 586ms elapsed (62%)"
+    /// with ms values in white and percentages in amber.
+    /// </summary>
+    private static SelectableTextBlock CreateOperatorTimingLine(string trimmed)
+    {
+        var tb = new SelectableTextBlock
+        {
+            FontFamily = MonoFont,
+            FontSize = 12,
+            TextWrapping = TextWrapping.Wrap,
+            Margin = new Avalonia.Thickness(16, 1, 0, 1)
+        };
+
+        // Split by ", " to get timing parts like "4,616ms CPU (61%)" and "586ms elapsed (62%)"
+        var parts = trimmed.Split(new[] { ", " }, StringSplitOptions.RemoveEmptyEntries);
+        for (int i = 0; i < parts.Length; i++)
+        {
+            if (i > 0)
+                tb.Inlines!.Add(new Run(", ") { Foreground = MutedBrush });
+
+            var part = parts[i].Trim();
+            // Extract percentage in parentheses at the end
+            var pctStart = part.LastIndexOf('(');
+            if (pctStart > 0 && part.EndsWith(")"))
+            {
+                var timePart = part[..pctStart].TrimEnd();
+                var pctPart = part[pctStart..];
+                var brush = timePart.Contains("CPU") ? ValueBrush : MutedBrush;
+                tb.Inlines!.Add(new Run(timePart) { Foreground = brush });
+                tb.Inlines.Add(new Run(" " + pctPart) { Foreground = WarningBrush });
+            }
+            else
+            {
+                var brush = part.Contains("CPU") ? ValueBrush : MutedBrush;
+                tb.Inlines!.Add(new Run(part) { Foreground = brush });
+            }
+        }
+
+        return tb;
+    }
+
+    private static SelectableTextBlock CreateWaitStatLine(string waitName, string waitValue, bool indented)
+    {
+        var leftMargin = indented ? 16.0 : 8.0;
+        var tb = new SelectableTextBlock
+        {
+            FontFamily = MonoFont,
+            FontSize = 12,
+            TextWrapping = TextWrapping.Wrap,
+            Margin = new Avalonia.Thickness(leftMargin, 1, 0, 1)
+        };
+
+        var waitBrush = GetWaitCategoryBrush(waitName);
+        tb.Inlines!.Add(new Run(waitName) { Foreground = waitBrush });
+        tb.Inlines.Add(new Run(": " + waitValue) { Foreground = ValueBrush });
+
+        return tb;
+    }
+
+    private static SolidColorBrush GetWaitCategoryBrush(string waitType)
+    {
+        // CPU-related
+        if (waitType.StartsWith("SOS_SCHEDULER") || waitType.StartsWith("CXPACKET") ||
+            waitType.StartsWith("CXCONSUMER") || waitType == "THREADPOOL" ||
+            waitType.StartsWith("EXECSYNC"))
+            return new SolidColorBrush(Color.Parse("#FFB347")); // orange
+
+        // I/O-related
+        if (waitType.StartsWith("PAGEIOLATCH") || waitType.StartsWith("WRITELOG") ||
+            waitType.StartsWith("IO_COMPLETION") || waitType.StartsWith("ASYNC_IO"))
+            return new SolidColorBrush(Color.Parse("#E57373")); // red
+
+        // Lock/blocking
+        if (waitType.StartsWith("LCK_") || waitType.StartsWith("LOCK"))
+            return new SolidColorBrush(Color.Parse("#E57373")); // red
+
+        // Memory
+        if (waitType.StartsWith("RESOURCE_SEMAPHORE") || waitType.StartsWith("CMEMTHREAD"))
+            return new SolidColorBrush(Color.Parse("#C792EA")); // purple
+
+        // Network
+        if (waitType.StartsWith("ASYNC_NETWORK"))
+            return new SolidColorBrush(Color.Parse("#6BB5FF")); // blue
+
+        return LabelBrush; // default muted
+    }
+}
diff --git a/src/PlanViewer.App/Services/UpdateChecker.cs b/src/PlanViewer.App/Services/UpdateChecker.cs
new file mode 100644
index 0000000..df0e343
--- /dev/null
+++ b/src/PlanViewer.App/Services/UpdateChecker.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Net.Http;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace PlanViewer.App.Services;
+
+public record UpdateCheckResult(bool UpdateAvailable, string? LatestVersion, string? ReleaseUrl, string? Error);
+
+public static class UpdateChecker
+{
+    private const string ReleasesApiUrl =
+        "https://api.github.com/repos/erikdarlingdata/PerformanceStudio/releases/latest";
+
+    private static readonly HttpClient Http = new()
+    {
+        DefaultRequestHeaders =
+        {
+            { "User-Agent", "PerformanceStudio-UpdateCheck" },
+            { "Accept", "application/vnd.github+json" }
+        },
+        Timeout = TimeSpan.FromSeconds(10)
+    };
+
+    public static async Task<UpdateCheckResult> CheckAsync(Version currentVersion)
+    {
+        try
+        {
+            var json = await Http.GetStringAsync(ReleasesApiUrl);
+            using var doc = JsonDocument.Parse(json);
+            var root = doc.RootElement;
+
+            var tagName = root.GetProperty("tag_name").GetString();
+            var htmlUrl = root.GetProperty("html_url").GetString();
+
+            if (string.IsNullOrEmpty(tagName))
+                return new UpdateCheckResult(false, null, null, "No release tag found");
+
+            // Strip leading 'v' from tag (e.g. "v0.9.0" -> "0.9.0")
+            var versionStr = tagName.StartsWith('v') ? tagName[1..] : tagName;
+
+            if (!Version.TryParse(versionStr, out var latestVersion))
+                return new UpdateCheckResult(false, tagName, htmlUrl, $"Could not parse version: {tagName}");
+
+            var updateAvailable = latestVersion > currentVersion;
+            return new UpdateCheckResult(updateAvailable, tagName, htmlUrl, null);
+        }
+        catch (Exception ex)
+        {
+            return new UpdateCheckResult(false, null, null, ex.Message);
+        }
+    }
+}
diff --git a/src/PlanViewer.Cli/PlanViewer.Cli.csproj b/src/PlanViewer.Cli/PlanViewer.Cli.csproj
index f07b1ac..c9f97e0 100644
--- a/src/PlanViewer.Cli/PlanViewer.Cli.csproj
+++ b/src/PlanViewer.Cli/PlanViewer.Cli.csproj
@@ -11,7 +11,7 @@
     <Nullable>enable</Nullable>
     <RootNamespace>PlanViewer.Cli</RootNamespace>
     <AssemblyName>planview</AssemblyName>
-    <Version>0.9.0</Version>
+    <Version>1.0.0</Version>
     <Authors>Erik Darling</Authors>
     <Company>Darling Data LLC</Company>
     <Product>Performance Studio</Product>
diff --git a/src/PlanViewer.Core/Output/TextFormatter.cs b/src/PlanViewer.Core/Output/TextFormatter.cs
index f298360..eb7f99e 100644
--- a/src/PlanViewer.Core/Output/TextFormatter.cs
+++ b/src/PlanViewer.Core/Output/TextFormatter.cs
@@ -18,21 +18,22 @@ public static void WriteText(AnalysisResult result, TextWriter writer)
         {
             WriteServerContext(result.ServerContext, writer);
         }
-        else if (result.SqlServerVersion != null)
+        else if (result.SqlServerBuild != null)
         {
-            writer.WriteLine($"SQL Server: {result.SqlServerVersion} (build {result.SqlServerBuild})");
+            writer.WriteLine($"SQL Server: {result.SqlServerBuild}");
         }
 
-        writer.WriteLine($"=== Statements: {result.Summary.TotalStatements} ===");
-        writer.WriteLine();
-
-        // Summary right after statement count
         writer.WriteLine("=== Summary ===");
+        writer.WriteLine($"Statements: {result.Summary.TotalStatements}");
         writer.WriteLine($"Warnings: {result.Summary.TotalWarnings} ({result.Summary.CriticalWarnings} critical)");
         writer.WriteLine($"Missing indexes: {result.Summary.MissingIndexes}");
         writer.WriteLine($"Actual stats: {(result.Summary.HasActualStats ? "yes" : "no (estimated plan)")}");
         if (result.Summary.WarningTypes.Count > 0)
-            writer.WriteLine($"Warning types: {string.Join(", ", result.Summary.WarningTypes)}");
+        {
+            writer.WriteLine("Warning types:");
+            foreach (var wt in result.Summary.WarningTypes)
+                writer.WriteLine($"  {wt}");
+        }
         writer.WriteLine();
 
         for (int i = 0; i < result.Statements.Count; i++)
@@ -41,10 +42,20 @@ public static void WriteText(AnalysisResult result, TextWriter writer)
             writer.WriteLine($"=== Statement {i + 1}: ===");
             writer.WriteLine(stmt.StatementText);
             writer.WriteLine();
-            writer.WriteLine($"Estimated cost: {stmt.EstimatedCost:F4}");
+            writer.WriteLine($"Estimated cost: {stmt.EstimatedCost:N2}");
 
             if (stmt.DegreeOfParallelism > 0)
-                writer.WriteLine($"DOP: {stmt.DegreeOfParallelism}");
+            {
+                var dopLine = $"DOP: {stmt.DegreeOfParallelism}";
+                if (stmt.QueryTime != null && stmt.QueryTime.ElapsedTimeMs > 0
+                    && stmt.QueryTime.CpuTimeMs > 0 && stmt.DegreeOfParallelism > 1)
+                {
+                    var speedup = (double)stmt.QueryTime.CpuTimeMs / stmt.QueryTime.ElapsedTimeMs;
+                    var efficiency = Math.Clamp((speedup - 1.0) / (stmt.DegreeOfParallelism - 1.0) * 100.0, 0, 100);
+                    dopLine += $" ({efficiency:N0}% efficient)";
+                }
+                writer.WriteLine(dopLine);
+            }
             if (stmt.NonParallelReason != null)
                 writer.WriteLine($"Serial reason: {stmt.NonParallelReason}");
             if (stmt.QueryTime != null)
@@ -53,10 +64,66 @@ public static void WriteText(AnalysisResult result, TextWriter writer)
             {
                 var grantedMB = stmt.MemoryGrant.GrantedKB / 1024.0;
                 var usedMB = stmt.MemoryGrant.MaxUsedKB / 1024.0;
+                var pctUsed = grantedMB > 0 ? usedMB / grantedMB * 100 : 0;
                 var pctContext = "";
                 if (result.ServerContext?.MaxServerMemoryMB > 0)
-                    pctContext = $" ({grantedMB / result.ServerContext.MaxServerMemoryMB * 100:N1}% of max server memory)";
-                writer.WriteLine($"Memory grant: {grantedMB:N1} MB granted, {usedMB:N1} MB used{pctContext}");
+                    pctContext = $", {grantedMB / result.ServerContext.MaxServerMemoryMB * 100:N1}% of max server memory";
+                writer.WriteLine($"Memory grant: {grantedMB:N1} MB granted, {usedMB:N1} MB used ({pctUsed:N0}% utilized{pctContext})");
+            }
+
+            // Expensive operators — promoted to right after memory grant.
+            // Answers "where did the time go?" before drilling into waits/warnings.
+            if (stmt.OperatorTree != null)
+            {
+                var nodeTimings = new List<(OperatorResult Node, long OwnCpuMs, long OwnElapsedMs)>();
+                CollectNodeTimings(stmt.OperatorTree, nodeTimings);
+
+                var topNodes = nodeTimings
+                    .Where(t => t.OwnCpuMs > 0 || t.OwnElapsedMs > 0)
+                    .OrderByDescending(t => Math.Max(t.OwnCpuMs, t.OwnElapsedMs))
+                    .Take(5)
+                    .ToList();
+
+                if (topNodes.Count > 0)
+                {
+                    writer.WriteLine("Expensive operators:");
+                    var totalCpu = stmt.QueryTime?.CpuTimeMs > 0 ? stmt.QueryTime.CpuTimeMs : 0;
+                    var totalElapsed = stmt.QueryTime?.ElapsedTimeMs ?? 0;
+                    foreach (var (n, ownCpu, ownElapsed) in topNodes)
+                    {
+                        var label = n.ObjectName != null
+                            ? $"{n.PhysicalOp} ({n.ObjectName})"
+                            : n.PhysicalOp;
+                        var nodeId = $" (Node {n.NodeId})";
+
+                        writer.WriteLine($"  {label}{nodeId}:");
+
+                        // Timing on its own line
+                        var timeParts = new List<string>();
+                        if (ownCpu > 0)
+                        {
+                            var cpuPct = totalCpu > 0 ? $" ({ownCpu * 100.0 / totalCpu:N0}%)" : "";
+                            timeParts.Add($"{ownCpu:N0}ms CPU{cpuPct}");
+                        }
+                        if (ownElapsed > 0)
+                        {
+                            var elPct = totalElapsed > 0 ? $" ({ownElapsed * 100.0 / totalElapsed:N0}%)" : "";
+                            timeParts.Add($"{ownElapsed:N0}ms elapsed{elPct}");
+                        }
+                        if (timeParts.Count > 0)
+                            writer.WriteLine($"    {string.Join(", ", timeParts)}");
+
+                        var details = new List<string>();
+                        if (n.ActualRows > 0)
+                            details.Add($"{n.ActualRows:N0} rows");
+                        if (n.ActualLogicalReads > 0)
+                            details.Add($"{n.ActualLogicalReads:N0} logical reads");
+                        if (n.ActualPhysicalReads > 0)
+                            details.Add($"{n.ActualPhysicalReads:N0} physical reads");
+                        if (details.Count > 0)
+                            writer.WriteLine($"    {string.Join(", ", details)}");
+                    }
+                }
             }
 
             if (stmt.WaitStats.Count > 0)
@@ -79,9 +146,16 @@ public static void WriteText(AnalysisResult result, TextWriter writer)
             if (stmt.Warnings.Count > 0)
             {
                 writer.WriteLine();
-                writer.WriteLine("Warnings:");
+                writer.WriteLine("Plan warnings:");
+                var hasDetailedMemoryGrant = stmt.Warnings.Any(w =>
+                    w.Type == "Excessive Memory Grant" || w.Type == "Large Memory Grant");
                 foreach (var w in stmt.Warnings)
-                    writer.WriteLine($"  [{w.Severity}] {w.Type}: {w.Message}");
+                {
+                    // Skip raw XML "Memory Grant" when analyzer provides better context
+                    if (w.Type == "Memory Grant" && hasDetailedMemoryGrant)
+                        continue;
+                    writer.WriteLine($"  [{w.Severity}] {w.Type}: {EscapeNewlines(w.Message)}");
+                }
             }
 
             if (stmt.OperatorTree != null)
@@ -92,8 +166,7 @@ public static void WriteText(AnalysisResult result, TextWriter writer)
                 {
                     writer.WriteLine();
                     writer.WriteLine("Operator warnings:");
-                    foreach (var w in nodeWarnings)
-                        writer.WriteLine($"  [{w.Severity}] {w.Operator}: {w.Message}");
+                    WriteGroupedOperatorWarnings(nodeWarnings, writer);
                 }
             }
 
@@ -108,47 +181,6 @@ public static void WriteText(AnalysisResult result, TextWriter writer)
                 }
             }
 
-            // Expensive operators — actual plans only, ranked by actual elapsed time.
-            // Row mode: elapsed is cumulative (parent includes children), so subtract
-            // children's time to isolate each operator's own work.
-            // Batch mode: elapsed is already per-operator.
-            // Estimated plans: no actual stats, nothing to rank — skip entirely.
-            if (stmt.OperatorTree != null)
-            {
-                var nodeTimings = new List<(OperatorResult Node, long OwnElapsedMs)>();
-                CollectNodeTimings(stmt.OperatorTree, nodeTimings);
-
-                var topNodes = nodeTimings
-                    .Where(t => t.OwnElapsedMs > 0)
-                    .OrderByDescending(t => t.OwnElapsedMs)
-                    .Take(5)
-                    .ToList();
-
-                if (topNodes.Count > 0)
-                {
-                    writer.WriteLine();
-                    writer.WriteLine("Expensive operators (by actual duration):");
-                    foreach (var (n, ownMs) in topNodes)
-                    {
-                        var label = n.ObjectName != null
-                            ? $"{n.PhysicalOp} ({n.ObjectName})"
-                            : n.PhysicalOp;
-
-                        var pctStr = stmt.QueryTime != null && stmt.QueryTime.ElapsedTimeMs > 0
-                            ? $" ({ownMs * 100.0 / stmt.QueryTime.ElapsedTimeMs:N0}% of total)"
-                            : "";
-                        writer.WriteLine($"  {label}:");
-                        writer.WriteLine($"   * {ownMs:N0}ms{pctStr}");
-                        if (n.ActualRows > 0)
-                            writer.WriteLine($"   * {n.ActualRows:N0} rows");
-                        if (n.ActualLogicalReads > 0)
-                            writer.WriteLine($"   * {n.ActualLogicalReads:N0} logical reads");
-                        if (n.ActualPhysicalReads > 0)
-                            writer.WriteLine($"   * {n.ActualPhysicalReads:N0} physical reads");
-                    }
-                }
-            }
-
             writer.WriteLine();
         }
     }
@@ -236,46 +268,144 @@ private static void CollectNodeWarnings(OperatorResult node, List<WarningResult>
             CollectNodeWarnings(child, warnings);
     }
 
-    private static void CollectNodeTimings(OperatorResult node, List<(OperatorResult Node, long OwnElapsedMs)> timings)
+    private static void WriteGroupedOperatorWarnings(List<WarningResult> warnings, TextWriter writer)
     {
-        if (node.ActualElapsedMs.HasValue)
+        // Split each message into "data | explanation" at the last sentence boundary
+        // that starts with "The " (the harm assessment). Group by shared explanation.
+        var entries = new List<(string Severity, string Operator, string Data, string? Explanation)>();
+        foreach (var w in warnings)
         {
-            var mode = node.ActualExecutionMode ?? node.ExecutionMode;
-            long ownMs;
-            if (mode == "Batch")
+            var msg = w.Message;
+            string data;
+            string? explanation = null;
+
+            // Find the harm sentence: ". The overestimate/underestimate..."
+            var splitIdx = msg.LastIndexOf(". The ", StringComparison.Ordinal);
+            if (splitIdx > 0)
             {
-                // Batch mode: elapsed is per-operator
-                ownMs = node.ActualElapsedMs.Value;
+                data = msg[..splitIdx].TrimEnd('.');
+                explanation = msg[(splitIdx + 2)..];
             }
-            else if (node.PhysicalOp == "Parallelism")
+            else
             {
-                // Parallel exchanges have misleading inflated times — skip them.
-                // Their own work is negligible; the time they report is mostly
-                // waiting on producers/consumers, not doing real work.
-                ownMs = -1; // sentinel: don't add to timings
+                data = msg;
+            }
+
+            entries.Add((w.Severity, w.Operator ?? "?", data, explanation));
+        }
+
+        // Group entries that share the same severity, type, and explanation
+        // Sort criticals before warnings before info
+        var grouped = entries
+            .GroupBy(e => (e.Severity, e.Explanation ?? ""))
+            .OrderBy(g => g.Key.Item1 switch { "Critical" => 0, "Warning" => 1, _ => 2 })
+            .ToList();
+
+        foreach (var group in grouped)
+        {
+            var items = group.ToList();
+            if (items.Count > 1 && group.Key.Item2 != "")
+            {
+                // Multiple operators with the same explanation — list compactly
+                foreach (var item in items)
+                    writer.WriteLine($"  [{item.Severity}] {item.Operator}: {EscapeNewlines(item.Data)}");
+                writer.WriteLine($"  -> {group.Key.Item2}");
             }
             else
             {
-                // Row mode: elapsed is cumulative, subtract ALL direct children.
-                // Exchange children have unreliable times — skip through to their
-                // real child for the elapsed value.
-                var childSum = GetChildElapsedSum(node);
-                ownMs = Math.Max(0, node.ActualElapsedMs.Value - childSum);
+                // Unique explanation or no explanation — write individually
+                foreach (var item in items)
+                {
+                    var full = item.Explanation != null ? $"{item.Data}. {item.Explanation}" : item.Data;
+                    writer.WriteLine($"  [{item.Severity}] {item.Operator}: {EscapeNewlines(full)}");
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Replaces newlines with unit separator (U+001F) so multi-line warning messages
+    /// survive the top-level line split in AdviceContentBuilder.Build().
+    /// CreateWarningBlock splits on U+001F to restore the internal structure.
+    /// </summary>
+    private static string EscapeNewlines(string text) => text.Replace('\n', '\x1F');
+
+    private static void CollectNodeTimings(OperatorResult node, List<(OperatorResult Node, long OwnCpuMs, long OwnElapsedMs)> timings)
+    {
+        // Skip exchanges — negligible own work, misleading elapsed times
+        if (node.PhysicalOp != "Parallelism")
+        {
+            var mode = node.ActualExecutionMode ?? node.ExecutionMode;
+
+            // Compute own CPU
+            long ownCpu = 0;
+            if (node.ActualCpuMs.HasValue)
+            {
+                if (mode == "Batch")
+                    ownCpu = node.ActualCpuMs.Value;
+                else
+                {
+                    var childCpuSum = GetChildCpuSum(node);
+                    ownCpu = Math.Max(0, node.ActualCpuMs.Value - childCpuSum);
+                }
+            }
+
+            // Compute own elapsed
+            long ownElapsed = 0;
+            if (node.ActualElapsedMs.HasValue)
+            {
+                if (mode == "Batch")
+                    ownElapsed = node.ActualElapsedMs.Value;
+                else
+                {
+                    var childSum = GetChildElapsedSum(node);
+                    ownElapsed = Math.Max(0, node.ActualElapsedMs.Value - childSum);
+                }
             }
 
-            if (ownMs >= 0)
-                timings.Add((node, ownMs));
+            // When CPU data is available, only include operators that did real CPU work.
+            // Row-mode elapsed with 0 CPU is a cumulative timing artifact, not real work.
+            if (node.ActualCpuMs.HasValue)
+            {
+                if (ownCpu > 0)
+                    timings.Add((node, ownCpu, ownElapsed));
+            }
+            else if (ownElapsed > 0)
+            {
+                // No CPU data (estimated plans) — fall back to elapsed only
+                timings.Add((node, 0, ownElapsed));
+            }
         }
 
         foreach (var child in node.Children)
             CollectNodeTimings(child, timings);
     }
 
+    /// <summary>
+    /// Sums CPU time from all direct children, skipping through transparent
+    /// operators (Compute Scalar, etc.) that have no runtime stats.
+    /// </summary>
+    private static long GetChildCpuSum(OperatorResult node)
+    {
+        long sum = 0;
+        foreach (var child in node.Children)
+        {
+            if (child.ActualCpuMs.HasValue)
+            {
+                sum += child.ActualCpuMs.Value;
+            }
+            else
+            {
+                // Transparent operator (e.g. Compute Scalar) — skip through
+                sum += GetChildCpuSum(child);
+            }
+        }
+        return sum;
+    }
+
     /// <summary>
     /// Sums elapsed time from all direct children, skipping through exchange
-    /// operators (their times are unreliable — they accumulate downstream wait
-    /// time from e.g. spilling sorts). For exchanges, uses the max elapsed of
-    /// the exchange's own children as the effective elapsed value.
+    /// and transparent operators.
     /// </summary>
     private static long GetChildElapsedSum(OperatorResult node)
     {
@@ -285,7 +415,6 @@ private static long GetChildElapsedSum(OperatorResult node)
             long childTime;
             if (child.PhysicalOp == "Parallelism" && child.Children.Count > 0)
             {
-                // Exchange: skip through, use max of its children
                 childTime = child.Children
                     .Where(c => c.ActualElapsedMs.HasValue)
                     .Select(c => c.ActualElapsedMs!.Value)
@@ -298,11 +427,11 @@ private static long GetChildElapsedSum(OperatorResult node)
             }
             else
             {
-                // No stats (e.g. Compute Scalar) — transparent, skip through
                 childTime = GetChildElapsedSum(child);
             }
             sum += childTime;
         }
         return sum;
     }
+
 }
diff --git a/src/PlanViewer.Core/Services/ActualPlanExecutor.cs b/src/PlanViewer.Core/Services/ActualPlanExecutor.cs
index 7413fa5..d77debb 100644
--- a/src/PlanViewer.Core/Services/ActualPlanExecutor.cs
+++ b/src/PlanViewer.Core/Services/ActualPlanExecutor.cs
@@ -7,6 +7,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -35,7 +36,7 @@ public static class ActualPlanExecutor
     /// <returns>The actual execution plan XML, or null if no plan was captured.</returns>
     public static async Task<string?> ExecuteForActualPlanAsync(
         string connectionString,
-        string databaseName,
+        string? databaseName,
         string queryText,
         string? planXml,
         string? isolationLevel,
@@ -55,7 +56,7 @@ public static class ActualPlanExecutor
         sb.AppendLine("SET STATISTICS XML OFF;");
 
         var fullScript = sb.ToString();
-        string? capturedPlanXml = null;
+        var capturedPlanXmls = new List<string>();
 
         /* Override database in connection string */
         var builder = new SqlConnectionStringBuilder(connectionString);
@@ -89,7 +90,7 @@ The plan result set has a single row with a single XML column. */
                 if (value != null && value.TrimStart().StartsWith("<ShowPlanXML", StringComparison.Ordinal))
                 {
                     /* This is a plan XML result set — capture it */
-                    capturedPlanXml = value;
+                    capturedPlanXmls.Add(value);
                 }
                 else
                 {
@@ -105,6 +106,8 @@ The plan result set has a single row with a single XML column. */
         }
         while (await reader.NextResultAsync(cancellationToken));
 
-        return capturedPlanXml;
+        if (capturedPlanXmls.Count == 0) return null;
+        if (capturedPlanXmls.Count == 1) return capturedPlanXmls[0];
+        return EstimatedPlanExecutor.MergeShowPlanXmls(capturedPlanXmls);
     }
 }
diff --git a/src/PlanViewer.Core/Services/CredentialServiceFactory.cs b/src/PlanViewer.Core/Services/CredentialServiceFactory.cs
index e99a654..648ff53 100644
--- a/src/PlanViewer.Core/Services/CredentialServiceFactory.cs
+++ b/src/PlanViewer.Core/Services/CredentialServiceFactory.cs
@@ -13,8 +13,7 @@ public static ICredentialService Create()
         if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             return new KeychainCredentialService();
 
-        throw new PlatformNotSupportedException(
-            "Credential storage is not yet supported on this platform. " +
-            "Windows and macOS are supported.");
+        // Linux and other platforms: use in-memory storage (credentials not persisted across sessions)
+        return new InMemoryCredentialService();
     }
 }
diff --git a/src/PlanViewer.Core/Services/EstimatedPlanExecutor.cs b/src/PlanViewer.Core/Services/EstimatedPlanExecutor.cs
index 41b1fad..fa58da8 100644
--- a/src/PlanViewer.Core/Services/EstimatedPlanExecutor.cs
+++ b/src/PlanViewer.Core/Services/EstimatedPlanExecutor.cs
@@ -1,6 +1,9 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Xml.Linq;
 using Microsoft.Data.SqlClient;
 
 namespace PlanViewer.Core.Services;
@@ -36,9 +39,9 @@ public static class EstimatedPlanExecutor
             await enableCmd.ExecuteNonQueryAsync(cancellationToken);
         }
 
-        // Execute the query — with SHOWPLAN XML ON, this returns the plan
-        // as a single-row, single-column result set (no actual execution)
-        string? planXml = null;
+        // Execute the query — with SHOWPLAN XML ON, this returns one result set
+        // per statement, each containing a ShowPlanXML document.
+        var planXmls = new List<string>();
         using (var queryCmd = new SqlCommand(queryText, connection))
         {
             queryCmd.CommandTimeout = timeoutSeconds;
@@ -49,12 +52,16 @@ public static class EstimatedPlanExecutor
             });
 
             using var reader = await queryCmd.ExecuteReaderAsync(cancellationToken);
-            if (await reader.ReadAsync(cancellationToken))
+            do
             {
-                var value = reader.GetValue(0)?.ToString();
-                if (value != null && value.TrimStart().StartsWith("<ShowPlanXML", StringComparison.Ordinal))
-                    planXml = value;
+                if (await reader.ReadAsync(cancellationToken))
+                {
+                    var value = reader.GetValue(0)?.ToString();
+                    if (value != null && value.TrimStart().StartsWith("<ShowPlanXML", StringComparison.Ordinal))
+                        planXmls.Add(value);
+                }
             }
+            while (await reader.NextResultAsync(cancellationToken));
         }
 
         // Disable SHOWPLAN XML (best effort — connection is about to close)
@@ -66,6 +73,31 @@ public static class EstimatedPlanExecutor
         }
         catch { /* connection cleanup */ }
 
-        return planXml;
+        if (planXmls.Count == 0) return null;
+        if (planXmls.Count == 1) return planXmls[0];
+        return MergeShowPlanXmls(planXmls);
+    }
+
+    /// <summary>
+    /// Merges multiple ShowPlanXML documents into one by combining all Batch elements.
+    /// </summary>
+    internal static string MergeShowPlanXmls(List<string> planXmls)
+    {
+        XNamespace ns = "http://schemas.microsoft.com/sqlserver/2004/07/showplan";
+        var baseDoc = XDocument.Parse(planXmls[0]);
+        var batchSequence = baseDoc.Root!.Element(ns + "BatchSequence")!;
+
+        for (int i = 1; i < planXmls.Count; i++)
+        {
+            var doc = XDocument.Parse(planXmls[i]);
+            var batches = doc.Root!.Element(ns + "BatchSequence")?.Elements(ns + "Batch");
+            if (batches != null)
+            {
+                foreach (var batch in batches)
+                    batchSequence.Add(batch);
+            }
+        }
+
+        return baseDoc.ToString(SaveOptions.DisableFormatting);
     }
 }
diff --git a/src/PlanViewer.Core/Services/InMemoryCredentialService.cs b/src/PlanViewer.Core/Services/InMemoryCredentialService.cs
new file mode 100644
index 0000000..733dc54
--- /dev/null
+++ b/src/PlanViewer.Core/Services/InMemoryCredentialService.cs
@@ -0,0 +1,39 @@
+using System.Collections.Concurrent;
+using PlanViewer.Core.Interfaces;
+
+namespace PlanViewer.Core.Services;
+
+/// <summary>
+/// In-memory credential service for platforms without native credential storage (e.g. Linux).
+/// Credentials are held for the lifetime of the app but not persisted to disk.
+/// </summary>
+public class InMemoryCredentialService : ICredentialService
+{
+    private readonly ConcurrentDictionary<string, (string Username, string Password)> _store = new();
+
+    public bool SaveCredential(string serverId, string username, string password)
+    {
+        _store[serverId] = (username, password);
+        return true;
+    }
+
+    public (string Username, string Password)? GetCredential(string serverId)
+    {
+        return _store.TryGetValue(serverId, out var cred) ? cred : null;
+    }
+
+    public bool DeleteCredential(string serverId)
+    {
+        return _store.TryRemove(serverId, out _);
+    }
+
+    public bool CredentialExists(string serverId)
+    {
+        return _store.ContainsKey(serverId);
+    }
+
+    public bool UpdateCredential(string serverId, string username, string password)
+    {
+        return SaveCredential(serverId, username, password);
+    }
+}
diff --git a/src/PlanViewer.Core/Services/PlanAnalyzer.cs b/src/PlanViewer.Core/Services/PlanAnalyzer.cs
index 93e23b1..75ae9b2 100644
--- a/src/PlanViewer.Core/Services/PlanAnalyzer.cs
+++ b/src/PlanViewer.Core/Services/PlanAnalyzer.cs
@@ -61,7 +61,8 @@ public static void Analyze(ParsedPlan plan, AnalyzerConfig? config = null)
         [21] = "CTE Multiple References", [22] = "Table Variable", [23] = "Table-Valued Function",
         [24] = "Top Above Scan", [25] = "Ineffective Parallelism", [26] = "Row Goal",
         [27] = "Optimize For Unknown", [28] = "NOT IN with Nullable Column",
-        [29] = "Implicit Conversion", [30] = "Wide Index Suggestion"
+        [29] = "Implicit Conversion", [30] = "Wide Index Suggestion",
+        [31] = "Parallel Wait Bottleneck"
     };
 
     // Reverse lookup: WarningType → rule number
@@ -276,20 +277,16 @@ private static void AnalyzeStatement(PlanStatement stmt, AnalyzerConfig cfg)
         // Rule 25: Ineffective parallelism — parallel plan where CPU ≈ elapsed
         // In an effective parallel plan, CPU time should be significantly higher than
         // elapsed time because multiple threads are working simultaneously.
-        // When they're nearly equal, the work ran essentially serially despite the
-        // overhead of thread scheduling and exchanges.
+        // When they're nearly equal (ratio 0.8–1.3), the work ran essentially serially.
         if (!cfg.IsRuleDisabled(25) && stmt.DegreeOfParallelism > 1 && stmt.QueryTimeStats != null)
         {
             var cpu = stmt.QueryTimeStats.CpuTimeMs;
             var elapsed = stmt.QueryTimeStats.ElapsedTimeMs;
 
-            // Only flag if elapsed is meaningful (>= 1 second) to avoid noise
             if (elapsed >= 1000 && cpu > 0)
             {
                 var ratio = (double)cpu / elapsed;
-                // A well-parallelized query at DOP N should have CPU/Elapsed near N.
-                // If CPU/Elapsed is close to 1.0, work was essentially serial.
-                if (ratio <= 1.3)
+                if (ratio >= 0.8 && ratio <= 1.3)
                 {
                     stmt.PlanWarnings.Add(new PlanWarning
                     {
@@ -303,6 +300,33 @@ private static void AnalyzeStatement(PlanStatement stmt, AnalyzerConfig cfg)
             }
         }
 
+        // Rule 31: Parallel wait bottleneck — elapsed time significantly exceeds CPU time
+        // When elapsed >> CPU in a parallel plan, threads are spending time waiting rather
+        // than doing CPU work. Common causes: spills to tempdb, physical I/O, blocking,
+        // memory grant waits, or other resource contention.
+        if (!cfg.IsRuleDisabled(31) && stmt.DegreeOfParallelism > 1 && stmt.QueryTimeStats != null)
+        {
+            var cpu = stmt.QueryTimeStats.CpuTimeMs;
+            var elapsed = stmt.QueryTimeStats.ElapsedTimeMs;
+
+            if (elapsed >= 1000 && cpu > 0)
+            {
+                var ratio = (double)cpu / elapsed;
+                if (ratio < 0.8)
+                {
+                    var waitPct = (1.0 - ratio) * 100;
+                    stmt.PlanWarnings.Add(new PlanWarning
+                    {
+                        WarningType = "Parallel Wait Bottleneck",
+                        Message = $"Parallel plan (DOP {stmt.DegreeOfParallelism}) with elapsed time ({elapsed:N0}ms) significantly exceeding CPU time ({cpu:N0}ms). " +
+                                  $"Approximately {waitPct:N0}% of elapsed time was spent waiting rather than on CPU. " +
+                                  $"Common causes include spills to tempdb, physical I/O reads, lock or latch contention, and memory grant waits.",
+                        Severity = PlanWarningSeverity.Warning
+                    });
+                }
+            }
+        }
+
         // Rule 30: Missing index quality evaluation
         if (!cfg.IsRuleDisabled(30))
         {
@@ -381,10 +405,16 @@ private static void AnalyzeNode(PlanNode node, PlanStatement stmt, AnalyzerConfi
         if (!cfg.IsRuleDisabled(1) && node.PhysicalOp == "Filter" && !string.IsNullOrEmpty(node.Predicate))
         {
             var impact = QuantifyFilterImpact(node);
+            var predicate = Truncate(node.Predicate, 200);
+            var message = "Filter operator discarding rows late in the plan.";
+            if (!string.IsNullOrEmpty(impact))
+                message += $"\n{impact}";
+            message += $"\nPredicate: {predicate}";
+
             node.Warnings.Add(new PlanWarning
             {
                 WarningType = "Filter Operator",
-                Message = $"Filter operator discarding rows late in the plan.{impact} Predicate: {Truncate(node.Predicate, 200)}",
+                Message = message,
                 Severity = PlanWarningSeverity.Warning
             });
         }
@@ -451,12 +481,12 @@ private static void AnalyzeNode(PlanNode node, PlanStatement stmt, AnalyzerConfi
                         var direction = ratio >= 10.0 ? "underestimated" : "overestimated";
                         var factor = ratio >= 10.0 ? ratio : 1.0 / ratio;
                         var actualDisplay = executions > 1
-                            ? $"actual {actualPerExec:N0}/exec ({node.ActualRows:N0} total across {executions:N0} executions)"
-                            : $"actual {node.ActualRows:N0}";
+                            ? $"Actual {node.ActualRows:N0} ({actualPerExec:N0} rows x {executions:N0} executions)"
+                            : $"Actual {node.ActualRows:N0}";
                         node.Warnings.Add(new PlanWarning
                         {
                             WarningType = "Row Estimate Mismatch",
-                            Message = $"Estimated {node.EstimateRows:N0} rows, {actualDisplay} ({factor:F0}x {direction}). {harm}",
+                            Message = $"Estimated {node.EstimateRows:N0} vs {actualDisplay} — {factor:F0}x {direction}. {harm}",
                             Severity = factor >= 100 ? PlanWarningSeverity.Critical : PlanWarningSeverity.Warning
                         });
                     }
@@ -572,7 +602,7 @@ private static void AnalyzeNode(PlanNode node, PlanStatement stmt, AnalyzerConfi
             node.Warnings.Add(new PlanWarning
             {
                 WarningType = "Key Lookup",
-                Message = $"Key Lookup — SQL Server found rows via a nonclustered index but had to go back to the clustered index for additional columns. Alter the nonclustered index to add the predicate column as a key column or as an INCLUDE column. Predicate: {Truncate(node.Predicate, 200)}",
+                Message = $"Key Lookup — SQL Server found rows via a nonclustered index but had to go back to the clustered index for additional columns. Alter the nonclustered index to add the predicate column as a key column or as an INCLUDE column.\nPredicate: {Truncate(node.Predicate, 200)}",
                 Severity = PlanWarningSeverity.Warning
             });
         }
@@ -600,7 +630,7 @@ _ when nonSargableReason.StartsWith("Function call") =>
             node.Warnings.Add(new PlanWarning
             {
                 WarningType = "Non-SARGable Predicate",
-                Message = $"{nonSargableAdvice} Predicate: {Truncate(node.Predicate!, 200)}",
+                Message = $"{nonSargableAdvice}\nPredicate: {Truncate(node.Predicate!, 200)}",
                 Severity = PlanWarningSeverity.Warning
             });
         }
@@ -610,10 +640,11 @@ _ when nonSargableReason.StartsWith("Function call") =>
         if (!cfg.IsRuleDisabled(11) && nonSargableReason == null && IsRowstoreScan(node) && !string.IsNullOrEmpty(node.Predicate) &&
             !IsProbeOnly(node.Predicate))
         {
+            var displayPredicate = StripProbeExpressions(node.Predicate);
             node.Warnings.Add(new PlanWarning
             {
                 WarningType = "Scan With Predicate",
-                Message = $"Scan with residual predicate — SQL Server is reading every row and filtering after the fact. Create an index on the predicate columns. Predicate: {Truncate(node.Predicate, 200)}",
+                Message = $"Scan with residual predicate — SQL Server is reading every row and filtering after the fact. Check that you have appropriate indexes.\nPredicate: {Truncate(displayPredicate, 200)}",
                 Severity = PlanWarningSeverity.Warning
             });
         }
@@ -641,7 +672,10 @@ _ when nonSargableReason.StartsWith("Function call") =>
 
         // Rule 14: Lazy Table Spool unfavorable rebind/rewind ratio
         // Rebinds = cache misses (child re-executes), rewinds = cache hits (reuse cached result)
-        if (!cfg.IsRuleDisabled(14) && node.LogicalOp == "Lazy Spool")
+        // Exclude Lazy Index Spools: they cache by correlated parameter value (like a hash table)
+        // so rebind/rewind counts are unreliable. See https://www.sql.kiwi/2025/02/lazy-index-spool/
+        if (!cfg.IsRuleDisabled(14) && node.LogicalOp == "Lazy Spool"
+            && !node.PhysicalOp.Contains("Index", StringComparison.OrdinalIgnoreCase))
         {
             var rebinds = node.HasActualStats ? (double)node.ActualRebinds : node.EstimateRebinds;
             var rewinds = node.HasActualStats ? (double)node.ActualRewinds : node.EstimateRewinds;
@@ -822,7 +856,7 @@ _ when nonSargableReason.StartsWith("Function call") =>
                     inner.Warnings.Add(new PlanWarning
                     {
                         WarningType = "Top Above Scan",
-                        Message = $"Top operator reads from {scanCandidate.PhysicalOp} (Node {scanCandidate.NodeId}) on the inner side of Nested Loops (Node {node.NodeId}).{predInfo} Create an index on the predicate columns to convert the scan into a seek.",
+                        Message = $"Top operator reads from {scanCandidate.PhysicalOp} (Node {scanCandidate.NodeId}) on the inner side of Nested Loops (Node {node.NodeId}).{predInfo} Check that you have appropriate indexes to convert the scan into a seek.",
                         Severity = PlanWarningSeverity.Warning
                     });
                 }
@@ -830,7 +864,11 @@ _ when nonSargableReason.StartsWith("Function call") =>
         }
 
         // Rule 26: Row Goal (informational) — optimizer reduced estimate due to TOP/EXISTS/IN
-        if (!cfg.IsRuleDisabled(26) && node.EstimateRowsWithoutRowGoal > 0 && node.EstimateRows > 0 &&
+        // Only surface on data access operators (seeks/scans) where the row goal actually matters
+        var isDataAccess = node.PhysicalOp != null &&
+            (node.PhysicalOp.Contains("Scan") || node.PhysicalOp.Contains("Seek"));
+        if (!cfg.IsRuleDisabled(26) && isDataAccess &&
+            node.EstimateRowsWithoutRowGoal > 0 && node.EstimateRows > 0 &&
             node.EstimateRowsWithoutRowGoal > node.EstimateRows)
         {
             var reduction = node.EstimateRowsWithoutRowGoal / node.EstimateRows;
@@ -845,7 +883,7 @@ _ when nonSargableReason.StartsWith("Function call") =>
         // Rule 28: Row Count Spool — NOT IN with nullable column
         // Pattern: Row Count Spool with high rewinds, child scan has IS NULL predicate,
         // and statement text contains NOT IN
-        if (!cfg.IsRuleDisabled(28) && node.PhysicalOp == "Row Count Spool")
+        if (!cfg.IsRuleDisabled(28) && node.PhysicalOp.Contains("Row Count Spool"))
         {
             var rewinds = node.HasActualStats ? (double)node.ActualRewinds : node.EstimateRewinds;
             if (rewinds > 10000 && HasNotInPattern(node, stmt))
@@ -942,6 +980,21 @@ private static bool IsProbeOnly(string predicate)
         return stripped.Length == 0;
     }
 
+    /// <summary>
+    /// Strips PROBE(...) bitmap filter expressions from a predicate for display,
+    /// leaving only the real residual predicate columns.
+    /// </summary>
+    private static string StripProbeExpressions(string predicate)
+    {
+        var stripped = Regex.Replace(predicate, @"\s*AND\s+PROBE\s*\([^()]*(?:\([^()]*\)[^()]*)*\)", "",
+            RegexOptions.IgnoreCase);
+        stripped = Regex.Replace(stripped, @"PROBE\s*\([^()]*(?:\([^()]*\)[^()]*)*\)\s*AND\s+", "",
+            RegexOptions.IgnoreCase);
+        stripped = Regex.Replace(stripped, @"PROBE\s*\([^()]*(?:\([^()]*\)[^()]*)*\)", "",
+            RegexOptions.IgnoreCase);
+        return stripped.Trim();
+    }
+
     /// <summary>
     /// Returns true for any scan operator including columnstore.
     /// Excludes spools and constant scans.
@@ -953,6 +1006,7 @@ private static bool IsScanOperator(PlanNode node)
                !node.PhysicalOp.Contains("Constant", StringComparison.OrdinalIgnoreCase);
     }
 
+
     /// <summary>
     /// Detects non-SARGable patterns in scan predicates.
     /// Returns a description of the issue, or null if the predicate is fine.
@@ -1223,7 +1277,7 @@ private static string QuantifyFilterImpact(PlanNode filterNode)
         if (parts.Count == 0)
             return "";
 
-        return $" Subtree cost to produce filtered rows: {string.Join(", ", parts)}.";
+        return string.Join("\n", parts.Select(p => "• " + p));
     }
 
     private static long SumSubtreeReads(PlanNode node)
@@ -1276,8 +1330,8 @@ private static long SumSubtreeReads(PlanNode node)
         if (node.LogicalOp.Contains("Join", StringComparison.OrdinalIgnoreCase) && !node.IsAdaptive)
         {
             return ratio >= 10.0
-                ? "The underestimate may have caused the optimizer to choose a suboptimal join strategy."
-                : "The overestimate may have caused the optimizer to choose a suboptimal join strategy.";
+                ? "The underestimate may have caused the optimizer to make poor choices."
+                : "The overestimate may have caused the optimizer to make poor choices.";
         }
 
         // Walk up to check if a parent was harmed by this bad estimate
@@ -1304,8 +1358,8 @@ private static long SumSubtreeReads(PlanNode node)
                     return null; // Adaptive join self-corrects — no harm
 
                 return ratio >= 10.0
-                    ? $"The underestimate may have caused the optimizer to choose {ancestor.PhysicalOp} when a different join type would be more efficient."
-                    : $"The overestimate may have caused the optimizer to choose {ancestor.PhysicalOp} when a different join type would be more efficient.";
+                    ? $"The underestimate may have caused the optimizer to make poor choices."
+                    : $"The overestimate may have caused the optimizer to make poor choices.";
             }
 
             // Parent Sort/Hash that spilled — downstream bad estimate caused the spill
diff --git a/src/PlanViewer.Core/Services/ShowPlanParser.cs b/src/PlanViewer.Core/Services/ShowPlanParser.cs
index 98a2c76..2d3037f 100644
--- a/src/PlanViewer.Core/Services/ShowPlanParser.cs
+++ b/src/PlanViewer.Core/Services/ShowPlanParser.cs
@@ -644,6 +644,7 @@ private static PlanNode ParseRelOp(XElement relOpEl)
             node.PhysicalOp = "Lazy " + node.PhysicalOp;
         }
 
+
         // Map to icon
         node.IconName = PlanIconMapper.GetIconName(node.PhysicalOp);
 
@@ -712,16 +713,36 @@ private static PlanNode ParseRelOp(XElement relOpEl)
             var seekParts = new List<string>();
             foreach (var sp in seekPreds)
             {
-                var scalarOps = sp.Descendants(Ns + "ScalarOperator");
-                foreach (var so in scalarOps)
+                foreach (var seekKeys in sp.Elements(Ns + "SeekKeys"))
                 {
-                    var val = so.Attribute("ScalarString")?.Value;
-                    if (!string.IsNullOrEmpty(val))
-                        seekParts.Add(val);
+                    // Each SeekKeys has Prefix, StartRange, EndRange with ScanType
+                    foreach (var range in seekKeys.Elements())
+                    {
+                        var scanType = range.Attribute("ScanType")?.Value;
+                        var cols = range.Element(Ns + "RangeColumns")?
+                            .Elements(Ns + "ColumnReference")
+                            .Select(FormatColumnRef)
+                            .ToList();
+                        var exprs = range.Element(Ns + "RangeExpressions")?
+                            .Elements(Ns + "ScalarOperator")
+                            .Select(so => so.Attribute("ScalarString")?.Value ?? "?")
+                            .ToList();
+
+                        if (cols != null && exprs != null)
+                        {
+                            var op = scanType switch
+                            {
+                                "EQ" => "=", "GT" => ">", "GE" => ">=",
+                                "LT" => "<", "LE" => "<=", _ => scanType ?? "="
+                            };
+                            for (int ci = 0; ci < cols.Count && ci < exprs.Count; ci++)
+                                seekParts.Add($"{cols[ci]} {op} {exprs[ci]}");
+                        }
+                    }
                 }
             }
             if (seekParts.Count > 0)
-                node.SeekPredicates = string.Join(" AND ", seekParts);
+                node.SeekPredicates = string.Join(", ", seekParts);
 
             // GuessedSelectivity — check if optimizer guessed selectivity on predicates
             if (ScopedDescendants(physicalOpEl, Ns + "GuessedSelectivity").Any())
@@ -1454,8 +1475,8 @@ private static List<PlanWarning> ParseWarningsFromElement(XElement warningsEl)
             result.Add(new PlanWarning
             {
                 WarningType = "No Join Predicate",
-                Message = "This join has no join predicate (possible cross join)",
-                Severity = PlanWarningSeverity.Critical
+                Message = "This join triggered a no join predicate warning, which is worth checking on, but is often misleading. The optimizer may have removed a redundant predicate after simplification.",
+                Severity = PlanWarningSeverity.Warning
             });
         }
 
diff --git a/tests/PlanViewer.Core.Tests/PlanAnalyzerTests.cs b/tests/PlanViewer.Core.Tests/PlanAnalyzerTests.cs
index cd55e7c..61cd337 100644
--- a/tests/PlanViewer.Core.Tests/PlanAnalyzerTests.cs
+++ b/tests/PlanViewer.Core.Tests/PlanAnalyzerTests.cs
@@ -321,14 +321,15 @@ public void Rule13_DataTypeMismatch_DetectedInMismatchedPlan()
     // ---------------------------------------------------------------
 
     [Fact]
-    public void Rule14_LazySpoolIneffective_DetectsUnfavorableRatio()
+    public void Rule14_LazySpoolIneffective_SkipsLazyIndexSpools()
     {
+        // Lazy Index Spools cache by correlated parameter value (like a hash table)
+        // so rebind/rewind counts are unreliable — Rule 14 should not fire.
+        // See https://www.sql.kiwi/2025/02/lazy-index-spool/
         var plan = PlanTestHelper.LoadAndAnalyze("lazy_spool_plan.sqlplan");
         var warnings = PlanTestHelper.WarningsOfType(plan, "Lazy Spool Ineffective");
 
-        Assert.Single(warnings);
-        Assert.Contains("rebinds", warnings[0].Message);
-        Assert.Contains("rewinds", warnings[0].Message);
+        Assert.Empty(warnings);
     }
 
     // ---------------------------------------------------------------
@@ -553,4 +554,209 @@ public void Rule29_ImplicitConvertSeekPlan_UpgradedToCritical()
         Assert.Contains(warnings, w => w.Severity == PlanWarningSeverity.Critical);
         Assert.Contains(warnings, w => w.Message.Contains("prevented an index seek"));
     }
+
+    // ---------------------------------------------------------------
+    // Rule 25: Ineffective Parallelism
+    // ---------------------------------------------------------------
+
+    [Fact]
+    public void Rule25_IneffectiveParallelism_DetectedWhenCpuEqualsElapsed()
+    {
+        // serially-parallel: DOP 8 but CPU 17,110ms ≈ elapsed 17,112ms (ratio ~1.0)
+        var plan = PlanTestHelper.LoadAndAnalyze("serially-parallel.sqlplan");
+        var warnings = PlanTestHelper.WarningsOfType(plan, "Ineffective Parallelism");
+
+        Assert.Single(warnings);
+        Assert.Contains("DOP 8", warnings[0].Message);
+        Assert.Contains("ran essentially serially", warnings[0].Message);
+    }
+
+    [Fact]
+    public void Rule25_IneffectiveParallelism_NotFiredOnEffectiveParallelPlan()
+    {
+        // parallel-skew: DOP 4, CPU 28,634ms vs elapsed 9,417ms (ratio ~3.0)
+        // This is effective parallelism — Rule 25 should NOT fire
+        var plan = PlanTestHelper.LoadAndAnalyze("parallel-skew.sqlplan");
+        var warnings = PlanTestHelper.WarningsOfType(plan, "Ineffective Parallelism");
+
+        Assert.Empty(warnings);
+    }
+
+    // ---------------------------------------------------------------
+    // Rule 28: NOT IN with Nullable Column (Row Count Spool)
+    // ---------------------------------------------------------------
+
+    [Fact]
+    public void Rule28_RowCountSpool_DetectsNotInWithNullableColumn()
+    {
+        // row-count-spool-slow: Row Count Spool with ~24M estimated rewinds,
+        // NOT IN pattern with nullable UserId column
+        var plan = PlanTestHelper.LoadAndAnalyze("row-count-spool-slow.sqlplan");
+        var warnings = PlanTestHelper.WarningsOfType(plan, "NOT IN with Nullable Column");
+
+        Assert.NotEmpty(warnings);
+        Assert.Contains(warnings, w => w.Message.Contains("NOT IN"));
+        Assert.Contains(warnings, w => w.Message.Contains("NOT EXISTS"));
+    }
+
+    // ---------------------------------------------------------------
+    // Rule 30: Missing Index Quality (Wide Index / Low Impact)
+    // ---------------------------------------------------------------
+
+    [Fact]
+    public void Rule30_MissingIndexQuality_DetectsWideOrLowImpact()
+    {
+        // slow-multi-seek has missing index suggestions — verify quality analysis runs
+        var plan = PlanTestHelper.LoadAndAnalyze("slow-multi-seek.sqlplan");
+        var stmt = PlanTestHelper.FirstStatement(plan);
+
+        // If there are missing indexes, the quality rules should evaluate them
+        if (stmt.MissingIndexes.Count > 0)
+        {
+            var allWarnings = PlanTestHelper.AllWarnings(plan);
+            var indexWarnings = allWarnings.Where(w =>
+                w.WarningType == "Low Impact Index" ||
+                w.WarningType == "Wide Index Suggestion" ||
+                w.WarningType == "Duplicate Index Suggestions").ToList();
+
+            // At minimum, the rule ran without errors
+            Assert.True(true);
+        }
+    }
+
+    // ---------------------------------------------------------------
+    // Rule 31: Parallel Wait Bottleneck
+    // ---------------------------------------------------------------
+
+    [Fact]
+    public void Rule31_ParallelWaitBottleneck_DetectedWhenElapsedExceedsCpu()
+    {
+        // excellent-parallel-spill: DOP 4, CPU 172,222ms vs elapsed 225,870ms
+        // ratio ~0.76 (< 0.8) — threads are waiting more than working
+        var plan = PlanTestHelper.LoadAndAnalyze("excellent-parallel-spill.sqlplan");
+        var warnings = PlanTestHelper.WarningsOfType(plan, "Parallel Wait Bottleneck");
+
+        Assert.Single(warnings);
+        Assert.Contains("DOP 4", warnings[0].Message);
+        Assert.Contains("waiting", warnings[0].Message);
+    }
+
+    // ---------------------------------------------------------------
+    // Seek Predicate Parsing
+    // ---------------------------------------------------------------
+
+    [Fact]
+    public void SeekPredicateParsing_FormatsColumnEqualsValue()
+    {
+        // slow-multi-seek: Index Seek with SeekPredicateNew containing
+        // SeekKeys with Prefix ranges (PostTypeId = value patterns)
+        var plan = PlanTestHelper.LoadAndAnalyze("slow-multi-seek.sqlplan");
+        var stmt = PlanTestHelper.FirstStatement(plan);
+        Assert.NotNull(stmt.RootNode);
+
+        // Find the Index Seek node
+        var seekNode = FindNodeByOp(stmt.RootNode, "Index Seek");
+        Assert.NotNull(seekNode);
+        Assert.NotNull(seekNode!.SeekPredicates);
+
+        // Should have Column = Value format, not bare scalar values
+        Assert.Contains("=", seekNode.SeekPredicates);
+    }
+
+    // ---------------------------------------------------------------
+    // Parameter Sniffing Detection (compiled vs runtime value mismatch)
+    // ---------------------------------------------------------------
+
+    [Fact]
+    public void ParameterParsing_DetectsCompiledVsRuntimeMismatch()
+    {
+        // param-sniffing-posttypeid2: compiled for @VoteTypeId=(4), executed with (2)
+        var plan = PlanTestHelper.LoadAndAnalyze("param-sniffing-posttypeid2.sqlplan");
+        var stmt = PlanTestHelper.FirstStatement(plan);
+
+        var param = stmt.Parameters.FirstOrDefault(p => p.Name == "@VoteTypeId");
+        Assert.NotNull(param);
+        Assert.NotEqual(param!.CompiledValue, param.RuntimeValue);
+    }
+
+    // ---------------------------------------------------------------
+    // PSPO / Dispatcher Detection
+    // ---------------------------------------------------------------
+
+    [Fact]
+    public void PspoParsing_DetectsDispatcherElement()
+    {
+        // pspo-example: Parameter Sensitive Plan Optimization with Dispatcher
+        var plan = PlanTestHelper.LoadAndAnalyze("pspo-example.sqlplan");
+        var stmt = PlanTestHelper.FirstStatement(plan);
+
+        Assert.NotNull(stmt.Dispatcher);
+        Assert.NotEmpty(stmt.Dispatcher!.ParameterSensitivePredicates);
+    }
+
+    // ---------------------------------------------------------------
+    // Spill Detection on Actual Plan
+    // ---------------------------------------------------------------
+
+    [Fact]
+    public void SpillDetection_MultipleSpillsInParallelPlan()
+    {
+        // excellent-parallel-spill: 3 SpillToTempDb warnings in a DOP 4 plan
+        var plan = PlanTestHelper.LoadAndAnalyze("excellent-parallel-spill.sqlplan");
+        var allWarnings = PlanTestHelper.AllWarnings(plan);
+
+        var spillWarnings = allWarnings.Where(w => w.SpillDetails != null).ToList();
+        Assert.NotEmpty(spillWarnings);
+    }
+
+    // ---------------------------------------------------------------
+    // Parallel Skew Detection — Effective Parallelism
+    // ---------------------------------------------------------------
+
+    [Fact]
+    public void ParallelSkew_DetectedInSkewedPlan()
+    {
+        // parallel-skew: DOP 4 with thread distribution skew on scan
+        var plan = PlanTestHelper.LoadAndAnalyze("parallel-skew.sqlplan");
+        var warnings = PlanTestHelper.WarningsOfType(plan, "Parallel Skew");
+
+        // Whether skew fires depends on the distribution in this plan.
+        // The important thing is the plan parses and analyzes without error.
+        // If skew is detected, it should have a meaningful message.
+        foreach (var w in warnings)
+        {
+            Assert.Contains("rows", w.Message);
+        }
+    }
+
+    // ---------------------------------------------------------------
+    // Helper
+    // ---------------------------------------------------------------
+
+    private static PlanNode? FindNodeByOp(PlanNode root, string physicalOp)
+    {
+        if (root.PhysicalOp == physicalOp) return root;
+        foreach (var child in root.Children)
+        {
+            var found = FindNodeByOp(child, physicalOp);
+            if (found != null) return found;
+        }
+        return null;
+    }
+
+    // ---------------------------------------------------------------
+    // NoJoinPredicate: verify it flows through to TextFormatter output
+    // ---------------------------------------------------------------
+
+    [Fact]
+    public void NoJoinPredicate_AppearsInTextFormatterOutput()
+    {
+        var plan = PlanTestHelper.LoadAndAnalyze("missing-join-predicate.sqlplan");
+        var analysis = PlanViewer.Core.Output.ResultMapper.Map(plan, "file");
+        var text = PlanViewer.Core.Output.TextFormatter.Format(analysis);
+
+        Assert.Contains("[Warning]", text);
+        Assert.Contains("No Join Predicate", text);
+        Assert.Contains("often misleading", text);
+    }
 }
diff --git a/tests/PlanViewer.Core.Tests/PlanTestHelper.cs b/tests/PlanViewer.Core.Tests/PlanTestHelper.cs
index 405682e..f14be76 100644
--- a/tests/PlanViewer.Core.Tests/PlanTestHelper.cs
+++ b/tests/PlanViewer.Core.Tests/PlanTestHelper.cs
@@ -19,6 +19,9 @@ public static ParsedPlan LoadAndAnalyze(string planFileName)
         Assert.True(File.Exists(path), $"Test plan not found: {path}");
 
         var xml = File.ReadAllText(path);
+        // SSMS saves plans as UTF-16 with encoding="utf-16" in the XML declaration.
+        // File.ReadAllText auto-detects BOM, but XDocument.Parse chokes on the declaration.
+        xml = xml.Replace("encoding=\"utf-16\"", "encoding=\"utf-8\"");
         var plan = ShowPlanParser.Parse(xml);
         PlanAnalyzer.Analyze(plan);
         return plan;
diff --git a/tests/PlanViewer.Core.Tests/Plans/excellent-parallel-spill.sqlplan b/tests/PlanViewer.Core.Tests/Plans/excellent-parallel-spill.sqlplan
new file mode 100644
index 0000000..03a0ec4
Binary files /dev/null and b/tests/PlanViewer.Core.Tests/Plans/excellent-parallel-spill.sqlplan differ
diff --git a/tests/PlanViewer.Core.Tests/Plans/missing-join-predicate.sqlplan b/tests/PlanViewer.Core.Tests/Plans/missing-join-predicate.sqlplan
new file mode 100644
index 0000000..222abb0
Binary files /dev/null and b/tests/PlanViewer.Core.Tests/Plans/missing-join-predicate.sqlplan differ
diff --git a/tests/PlanViewer.Core.Tests/Plans/parallel-skew.sqlplan b/tests/PlanViewer.Core.Tests/Plans/parallel-skew.sqlplan
new file mode 100644
index 0000000..8080495
--- /dev/null
+++ b/tests/PlanViewer.Core.Tests/Plans/parallel-skew.sqlplan
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="utf-16"?>
+<ShowPlanXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="1.481" Build="14.0.3076.1" xmlns="http://schemas.microsoft.com/sqlserver/2004/07/showplan">
+  <BatchSequence>
+    <Batch>
+      <Statements>
+        <StmtSimple StatementCompId="1" StatementEstRows="2982900" StatementId="1" StatementOptmLevel="FULL" CardinalityEstimationModelVersion="140" StatementSubTreeCost="6729.7" StatementText="SELECT   p.*&#xD;&#xA;    FROM     dbo.Posts AS p&#xD;&#xA;    JOIN     dbo.Votes AS v&#xD;&#xA;        ON p.Id = v.PostId&#xD;&#xA;    LEFT JOIN #t ON 1 = 0&#xD;&#xA;    WHERE    p.PostTypeId = 2&#xD;&#xA;    AND      p.CreationDate &gt;= '20131225'&#xD;&#xA;    ORDER BY p.Id&#xD;&#xA;	OPTION(HASH JOIN)" StatementType="SELECT" QueryHash="0x9664591FD28F1ED0" QueryPlanHash="0xD085377FB9139FA2" RetrievedFromCache="true" SecurityPolicyApplied="false">
+          <StatementSetOptions ANSI_NULLS="true" ANSI_PADDING="true" ANSI_WARNINGS="true" ARITHABORT="true" CONCAT_NULL_YIELDS_NULL="true" NUMERIC_ROUNDABORT="false" QUOTED_IDENTIFIER="true" />
+          <QueryPlan DegreeOfParallelism="4" MemoryGrant="368856" CachedPlanSize="104" CompileTime="3" CompileCPU="3" CompileMemory="448">
+            <ThreadStat Branches="1" UsedThreads="4">
+              <ThreadReservation NodeId="0" ReservedThreads="5" />
+            </ThreadStat>
+            <MissingIndexes>
+              <MissingIndexGroup Impact="26.3529">
+                <MissingIndex Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]">
+                  <ColumnGroup Usage="EQUALITY">
+                    <Column Name="[PostTypeId]" ColumnId="16" />
+                  </ColumnGroup>
+                  <ColumnGroup Usage="INEQUALITY">
+                    <Column Name="[CreationDate]" ColumnId="8" />
+                  </ColumnGroup>
+                  <ColumnGroup Usage="INCLUDE">
+                    <Column Name="[AcceptedAnswerId]" ColumnId="2" />
+                    <Column Name="[AnswerCount]" ColumnId="3" />
+                    <Column Name="[Body]" ColumnId="4" />
+                    <Column Name="[ClosedDate]" ColumnId="5" />
+                    <Column Name="[CommentCount]" ColumnId="6" />
+                    <Column Name="[CommunityOwnedDate]" ColumnId="7" />
+                    <Column Name="[FavoriteCount]" ColumnId="9" />
+                    <Column Name="[LastActivityDate]" ColumnId="10" />
+                    <Column Name="[LastEditDate]" ColumnId="11" />
+                    <Column Name="[LastEditorDisplayName]" ColumnId="12" />
+                    <Column Name="[LastEditorUserId]" ColumnId="13" />
+                    <Column Name="[OwnerUserId]" ColumnId="14" />
+                    <Column Name="[ParentId]" ColumnId="15" />
+                    <Column Name="[Score]" ColumnId="17" />
+                    <Column Name="[Tags]" ColumnId="18" />
+                    <Column Name="[Title]" ColumnId="19" />
+                    <Column Name="[ViewCount]" ColumnId="20" />
+                  </ColumnGroup>
+                </MissingIndex>
+              </MissingIndexGroup>
+            </MissingIndexes>
+            <MemoryGrantInfo SerialRequiredMemory="1176" SerialDesiredMemory="365112" RequiredMemory="4920" DesiredMemory="368856" RequestedMemory="368856" GrantWaitTime="0" GrantedMemory="368856" MaxUsedMemory="184832" MaxQueryMemory="9702144" />
+            <OptimizerHardwareDependentProperties EstimatedAvailableMemoryGrant="655360" EstimatedPagesCached="327680" EstimatedAvailableDegreeOfParallelism="4" MaxCompileMemory="36815160" />
+            <OptimizerStatsUsage>
+              <StatisticsInfo Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Statistics="[PK_Posts_Id]" ModificationCount="6" SamplingPercent="0.85705" LastUpdate="2019-04-05T15:06:57.53" />
+              <StatisticsInfo Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Statistics="[_WA_Sys_00000010_0519C6AF]" ModificationCount="0" SamplingPercent="0.85705" LastUpdate="2019-05-07T20:15:46.65" />
+              <StatisticsInfo Database="[StackOverflow2013]" Schema="[dbo]" Table="[Votes]" Statistics="[_WA_Sys_00000002_0AD2A005]" ModificationCount="0" SamplingPercent="0.925071" LastUpdate="2019-05-07T20:15:47.23" />
+              <StatisticsInfo Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Statistics="[_WA_Sys_00000008_0519C6AF]" ModificationCount="0" SamplingPercent="0.85705" LastUpdate="2019-05-07T20:15:46.24" />
+            </OptimizerStatsUsage>
+            <WaitStats>
+              <Wait WaitType="MEMORY_ALLOCATION_EXT" WaitTimeMs="1" WaitCount="1900" />
+              <Wait WaitType="HTBUILD" WaitTimeMs="1" WaitCount="6" />
+              <Wait WaitType="BMPBUILD" WaitTimeMs="3" WaitCount="6" />
+              <Wait WaitType="RESERVED_MEMORY_ALLOCATION_EXT" WaitTimeMs="7" WaitCount="21351" />
+              <Wait WaitType="SOS_SCHEDULER_YIELD" WaitTimeMs="18" WaitCount="6099" />
+              <Wait WaitType="HTREPARTITION" WaitTimeMs="1193" WaitCount="6" />
+              <Wait WaitType="ASYNC_NETWORK_IO" WaitTimeMs="1358" WaitCount="17777" />
+              <Wait WaitType="HTDELETE" WaitTimeMs="1601" WaitCount="6" />
+              <Wait WaitType="BPSORT" WaitTimeMs="4974" WaitCount="607" />
+              <Wait WaitType="CXPACKET" WaitTimeMs="9276" WaitCount="9446" />
+            </WaitStats>
+            <QueryTimeStats CpuTime="28634" ElapsedTime="9417" />
+            <RelOp AvgRowSize="4567" EstimateCPU="257.613" EstimateIO="0" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row" EstimateRows="2982900" LogicalOp="Gather Streams" NodeId="0" Parallel="true" PhysicalOp="Parallelism" EstimatedTotalSubtreeCost="6729.7">
+              <OutputList>
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Id" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="AcceptedAnswerId" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="AnswerCount" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Body" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="ClosedDate" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CommentCount" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CommunityOwnedDate" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CreationDate" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="FavoriteCount" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastActivityDate" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastEditDate" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastEditorDisplayName" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastEditorUserId" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="OwnerUserId" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="ParentId" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="PostTypeId" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Score" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Tags" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Title" />
+                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="ViewCount" />
+              </OutputList>
+              <RunTimeInformation>
+                <RunTimeCountersPerThread Thread="0" ActualRows="53946" Batches="0" ActualEndOfScans="1" ActualExecutions="1" ActualExecutionMode="Row" ActualElapsedms="7806" ActualCPUms="72" />
+              </RunTimeInformation>
+              <Parallelism>
+                <OrderBy>
+                  <OrderByColumn Ascending="true">
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Id" />
+                  </OrderByColumn>
+                </OrderBy>
+                <RelOp AvgRowSize="4567" EstimateCPU="1.77525" EstimateIO="2799.27" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Batch" EstimateRows="2982900" LogicalOp="Sort" NodeId="1" Parallel="true" PhysicalOp="Sort" EstimatedTotalSubtreeCost="6472.08">
+                  <OutputList>
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Id" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="AcceptedAnswerId" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="AnswerCount" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Body" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="ClosedDate" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CommentCount" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CommunityOwnedDate" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CreationDate" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="FavoriteCount" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastActivityDate" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastEditDate" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastEditorDisplayName" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastEditorUserId" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="OwnerUserId" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="ParentId" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="PostTypeId" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Score" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Tags" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Title" />
+                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="ViewCount" />
+                  </OutputList>
+                  <MemoryFractions Input="1" Output="1" />
+                  <RunTimeInformation>
+                    <RunTimeCountersPerThread Thread="4" ActualRows="0" Batches="0" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Batch" ActualElapsedms="1661" ActualCPUms="4" ActualScans="0" ActualLogicalReads="0" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                    <RunTimeCountersPerThread Thread="3" ActualRows="0" Batches="0" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Batch" ActualElapsedms="1684" ActualCPUms="26" ActualScans="0" ActualLogicalReads="0" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                    <RunTimeCountersPerThread Thread="2" ActualRows="0" Batches="0" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Batch" ActualElapsedms="1663" ActualCPUms="5" ActualScans="0" ActualLogicalReads="0" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                    <RunTimeCountersPerThread Thread="1" ActualRows="53946" Batches="60" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Batch" ActualElapsedms="30" ActualCPUms="27" ActualScans="0" ActualLogicalReads="0" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                    <RunTimeCountersPerThread Thread="0" ActualRows="0" Batches="0" ActualEndOfScans="0" ActualExecutions="0" ActualExecutionMode="Row" ActualElapsedms="0" ActualCPUms="0" />
+                  </RunTimeInformation>
+                  <Sort Distinct="false">
+                    <OrderBy>
+                      <OrderByColumn Ascending="true">
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Id" />
+                      </OrderByColumn>
+                    </OrderBy>
+                    <RelOp AvgRowSize="4567" EstimateCPU="3.86941" EstimateIO="0" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Batch" EstimateRows="2982900" LogicalOp="Inner Join" NodeId="2" Parallel="true" PhysicalOp="Hash Match" EstimatedTotalSubtreeCost="3671.03">
+                      <OutputList>
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Id" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="AcceptedAnswerId" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="AnswerCount" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Body" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="ClosedDate" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CommentCount" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CommunityOwnedDate" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CreationDate" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="FavoriteCount" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastActivityDate" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastEditDate" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastEditorDisplayName" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastEditorUserId" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="OwnerUserId" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="ParentId" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="PostTypeId" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Score" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Tags" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Title" />
+                        <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="ViewCount" />
+                      </OutputList>
+                      <MemoryFractions Input="0" Output="0" />
+                      <RunTimeInformation>
+                        <RunTimeCountersPerThread Thread="4" ActualRows="0" Batches="0" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Batch" ActualElapsedms="174" ActualCPUms="29" ActualScans="0" ActualLogicalReads="0" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                        <RunTimeCountersPerThread Thread="3" ActualRows="53946" Batches="60" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Batch" ActualElapsedms="11" ActualCPUms="6" ActualScans="0" ActualLogicalReads="0" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                        <RunTimeCountersPerThread Thread="2" ActualRows="0" Batches="0" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Batch" ActualElapsedms="1912" ActualCPUms="2" ActualScans="0" ActualLogicalReads="0" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                        <RunTimeCountersPerThread Thread="1" ActualRows="0" Batches="0" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Batch" ActualElapsedms="741" ActualCPUms="2" ActualScans="0" ActualLogicalReads="0" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                        <RunTimeCountersPerThread Thread="0" ActualRows="0" Batches="0" ActualEndOfScans="0" ActualExecutions="0" ActualExecutionMode="Row" ActualElapsedms="0" ActualCPUms="0" />
+                      </RunTimeInformation>
+                      <Hash BitmapCreator="true">
+                        <DefinedValues>
+                          <DefinedValue>
+                            <ColumnReference Column="Opt_Bitmap1006" />
+                          </DefinedValue>
+                        </DefinedValues>
+                        <HashKeysBuild>
+                          <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Id" />
+                        </HashKeysBuild>
+                        <HashKeysProbe>
+                          <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Votes]" Alias="[v]" Column="PostId" />
+                        </HashKeysProbe>
+                        <RelOp AvgRowSize="4567" EstimateCPU="4.71414" EstimateIO="3463.95" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row" EstimateRows="56661.9" EstimatedRowsRead="17142200" LogicalOp="Clustered Index Scan" NodeId="3" Parallel="true" PhysicalOp="Clustered Index Scan" EstimatedTotalSubtreeCost="3468.67" TableCardinality="17142200">
+                          <OutputList>
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Id" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="AcceptedAnswerId" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="AnswerCount" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Body" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="ClosedDate" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CommentCount" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CommunityOwnedDate" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CreationDate" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="FavoriteCount" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastActivityDate" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastEditDate" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastEditorDisplayName" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastEditorUserId" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="OwnerUserId" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="ParentId" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="PostTypeId" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Score" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Tags" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Title" />
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="ViewCount" />
+                          </OutputList>
+                          <RunTimeInformation>
+                            <RunTimeCountersPerThread Thread="4" ActualRows="47575" ActualRowsRead="4450803" Batches="53" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Row" ActualElapsedms="4893" ActualCPUms="4893" ActualScans="1" ActualLogicalReads="1228778" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                            <RunTimeCountersPerThread Thread="3" ActualRows="0" ActualRowsRead="4613343" Batches="0" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Row" ActualElapsedms="4961" ActualCPUms="4960" ActualScans="1" ActualLogicalReads="1270485" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                            <RunTimeCountersPerThread Thread="2" ActualRows="0" ActualRowsRead="3452131" Batches="0" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Row" ActualElapsedms="3823" ActualCPUms="3821" ActualScans="1" ActualLogicalReads="929859" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                            <RunTimeCountersPerThread Thread="1" ActualRows="0" ActualRowsRead="4625892" Batches="0" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Row" ActualElapsedms="4965" ActualCPUms="4965" ActualScans="1" ActualLogicalReads="1274369" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                            <RunTimeCountersPerThread Thread="0" ActualRows="0" Batches="0" ActualEndOfScans="0" ActualExecutions="0" ActualExecutionMode="Row" ActualElapsedms="0" ActualCPUms="0" ActualScans="1" ActualLogicalReads="67" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                          </RunTimeInformation>
+                          <IndexScan Ordered="false" ForcedIndex="false" ForceScan="false" NoExpandHint="false" Storage="RowStore">
+                            <DefinedValues>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Id" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="AcceptedAnswerId" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="AnswerCount" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Body" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="ClosedDate" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CommentCount" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CommunityOwnedDate" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CreationDate" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="FavoriteCount" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastActivityDate" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastEditDate" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastEditorDisplayName" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="LastEditorUserId" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="OwnerUserId" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="ParentId" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="PostTypeId" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Score" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Tags" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="Title" />
+                              </DefinedValue>
+                              <DefinedValue>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="ViewCount" />
+                              </DefinedValue>
+                            </DefinedValues>
+                            <Object Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Index="[PK_Posts_Id]" Alias="[p]" IndexKind="Clustered" Storage="RowStore" />
+                            <Predicate>
+                              <ScalarOperator ScalarString="[StackOverflow2013].[dbo].[Posts].[PostTypeId] as [p].[PostTypeId]=(2) AND [StackOverflow2013].[dbo].[Posts].[CreationDate] as [p].[CreationDate]&gt;='2013-12-25 00:00:00.000'">
+                                <Logical Operation="AND">
+                                  <ScalarOperator>
+                                    <Compare CompareOp="EQ">
+                                      <ScalarOperator>
+                                        <Identifier>
+                                          <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="PostTypeId" />
+                                        </Identifier>
+                                      </ScalarOperator>
+                                      <ScalarOperator>
+                                        <Const ConstValue="(2)" />
+                                      </ScalarOperator>
+                                    </Compare>
+                                  </ScalarOperator>
+                                  <ScalarOperator>
+                                    <Compare CompareOp="GE">
+                                      <ScalarOperator>
+                                        <Identifier>
+                                          <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Posts]" Alias="[p]" Column="CreationDate" />
+                                        </Identifier>
+                                      </ScalarOperator>
+                                      <ScalarOperator>
+                                        <Const ConstValue="'2013-12-25 00:00:00.000'" />
+                                      </ScalarOperator>
+                                    </Compare>
+                                  </ScalarOperator>
+                                </Logical>
+                              </ScalarOperator>
+                            </Predicate>
+                          </IndexScan>
+                        </RelOp>
+                        <RelOp AvgRowSize="11" EstimateCPU="14.5554" EstimateIO="179.85" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row" EstimateRows="5292870" LogicalOp="Filter" NodeId="4" Parallel="true" PhysicalOp="Filter" EstimatedTotalSubtreeCost="194.405">
+                          <OutputList>
+                            <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Votes]" Alias="[v]" Column="PostId" />
+                          </OutputList>
+                          <RunTimeInformation>
+                            <RunTimeCountersPerThread Thread="4" ActualRows="0" Batches="0" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Row" ActualElapsedms="2658" ActualCPUms="2658" />
+                            <RunTimeCountersPerThread Thread="3" ActualRows="53946" Batches="60" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Row" ActualElapsedms="2729" ActualCPUms="2729" />
+                            <RunTimeCountersPerThread Thread="2" ActualRows="0" Batches="0" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Row" ActualElapsedms="1987" ActualCPUms="1987" />
+                            <RunTimeCountersPerThread Thread="1" ActualRows="0" Batches="0" ActualEndOfScans="0" ActualExecutions="1" ActualExecutionMode="Row" ActualElapsedms="2017" ActualCPUms="2017" />
+                            <RunTimeCountersPerThread Thread="0" ActualRows="0" Batches="0" ActualEndOfScans="0" ActualExecutions="0" ActualExecutionMode="Row" ActualElapsedms="0" ActualCPUms="0" />
+                          </RunTimeInformation>
+                          <Filter StartupExpression="false">
+                            <RelOp AvgRowSize="11" EstimateCPU="14.5554" EstimateIO="179.85" EstimateRebinds="0" EstimateRewinds="0" EstimatedExecutionMode="Row" EstimateRows="52928700" EstimatedRowsRead="52928700" LogicalOp="Clustered Index Scan" NodeId="5" Parallel="true" PhysicalOp="Clustered Index Scan" EstimatedTotalSubtreeCost="194.405" TableCardinality="52928700">
+                              <OutputList>
+                                <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Votes]" Alias="[v]" Column="PostId" />
+                              </OutputList>
+                              <RunTimeInformation>
+                                <RunTimeCountersPerThread Thread="4" ActualRows="15328467" ActualRowsRead="15328467" Batches="0" ActualEndOfScans="1" ActualExecutions="1" ActualExecutionMode="Row" ActualElapsedms="1702" ActualCPUms="1702" ActualScans="1" ActualLogicalReads="70601" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                                <RunTimeCountersPerThread Thread="3" ActualRows="15769296" ActualRowsRead="15769296" Batches="0" ActualEndOfScans="1" ActualExecutions="1" ActualExecutionMode="Row" ActualElapsedms="1719" ActualCPUms="1719" ActualScans="1" ActualLogicalReads="72628" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                                <RunTimeCountersPerThread Thread="2" ActualRows="10983276" ActualRowsRead="10983276" Batches="0" ActualEndOfScans="1" ActualExecutions="1" ActualExecutionMode="Row" ActualElapsedms="1276" ActualCPUms="1276" ActualScans="1" ActualLogicalReads="50631" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                                <RunTimeCountersPerThread Thread="1" ActualRows="10847681" ActualRowsRead="10847681" Batches="0" ActualEndOfScans="1" ActualExecutions="1" ActualExecutionMode="Row" ActualElapsedms="1279" ActualCPUms="1279" ActualScans="1" ActualLogicalReads="50004" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                                <RunTimeCountersPerThread Thread="0" ActualRows="0" Batches="0" ActualEndOfScans="0" ActualExecutions="0" ActualExecutionMode="Row" ActualElapsedms="0" ActualCPUms="0" ActualScans="1" ActualLogicalReads="2" ActualPhysicalReads="0" ActualReadAheads="0" ActualLobLogicalReads="0" ActualLobPhysicalReads="0" ActualLobReadAheads="0" />
+                              </RunTimeInformation>
+                              <IndexScan Ordered="false" ForcedIndex="false" ForceScan="false" NoExpandHint="false" Storage="RowStore">
+                                <DefinedValues>
+                                  <DefinedValue>
+                                    <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Votes]" Alias="[v]" Column="PostId" />
+                                  </DefinedValue>
+                                </DefinedValues>
+                                <Object Database="[StackOverflow2013]" Schema="[dbo]" Table="[Votes]" Index="[PK_Votes_Id]" Alias="[v]" IndexKind="Clustered" Storage="RowStore" />
+                              </IndexScan>
+                            </RelOp>
+                            <Predicate>
+                              <ScalarOperator ScalarString="PROBE([Opt_Bitmap1006],[StackOverflow2013].[dbo].[Votes].[PostId] as [v].[PostId])">
+                                <Intrinsic FunctionName="PROBE">
+                                  <ScalarOperator>
+                                    <Identifier>
+                                      <ColumnReference Column="Opt_Bitmap1006" />
+                                    </Identifier>
+                                  </ScalarOperator>
+                                  <ScalarOperator>
+                                    <Identifier>
+                                      <ColumnReference Database="[StackOverflow2013]" Schema="[dbo]" Table="[Votes]" Alias="[v]" Column="PostId" />
+                                    </Identifier>
+                                  </ScalarOperator>
+                                </Intrinsic>
+                              </ScalarOperator>
+                            </Predicate>
+                          </Filter>
+                        </RelOp>
+                      </Hash>
+                    </RelOp>
+                  </Sort>
+                </RelOp>
+              </Parallelism>
+            </RelOp>
+          </QueryPlan>
+        </StmtSimple>
+      </Statements>
+    </Batch>
+  </BatchSequence>
+</ShowPlanXML>
\ No newline at end of file
diff --git a/tests/PlanViewer.Core.Tests/Plans/param-sniffing-posttypeid2.sqlplan b/tests/PlanViewer.Core.Tests/Plans/param-sniffing-posttypeid2.sqlplan
new file mode 100644
index 0000000..21dcf7c
Binary files /dev/null and b/tests/PlanViewer.Core.Tests/Plans/param-sniffing-posttypeid2.sqlplan differ
diff --git a/tests/PlanViewer.Core.Tests/Plans/pspo-example.sqlplan b/tests/PlanViewer.Core.Tests/Plans/pspo-example.sqlplan
new file mode 100644
index 0000000..194bfb4
Binary files /dev/null and b/tests/PlanViewer.Core.Tests/Plans/pspo-example.sqlplan differ
diff --git a/tests/PlanViewer.Core.Tests/Plans/row-count-spool-slow.sqlplan b/tests/PlanViewer.Core.Tests/Plans/row-count-spool-slow.sqlplan
new file mode 100644
index 0000000..d484bf2
Binary files /dev/null and b/tests/PlanViewer.Core.Tests/Plans/row-count-spool-slow.sqlplan differ
diff --git a/tests/PlanViewer.Core.Tests/Plans/serially-parallel.sqlplan b/tests/PlanViewer.Core.Tests/Plans/serially-parallel.sqlplan
new file mode 100644
index 0000000..8a1f9d3
Binary files /dev/null and b/tests/PlanViewer.Core.Tests/Plans/serially-parallel.sqlplan differ
diff --git a/tests/PlanViewer.Core.Tests/Plans/slow-multi-seek.sqlplan b/tests/PlanViewer.Core.Tests/Plans/slow-multi-seek.sqlplan
new file mode 100644
index 0000000..a87ee00
Binary files /dev/null and b/tests/PlanViewer.Core.Tests/Plans/slow-multi-seek.sqlplan differ