diff --git a/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs b/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs
index ce08726a1..b96d245ce 100644
--- a/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs
+++ b/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs
@@ -30,8 +30,8 @@ public abstract class ExportCommandBase : DiscordCommandBase
         "output",
         'o',
         Description = "Output file or directory path. "
-            + "Directory path must end with a slash to avoid ambiguity. "
-            + "If a directory is specified, file names will be generated automatically. "
+            + "If a directory is specified, file names will be generated automatically based on the channel names and export parameters. "
+            + "Directory paths must end with a slash to avoid ambiguity. "
             + "Supports template tokens, see the documentation for more info."
     )]
     public string OutputPath
diff --git a/DiscordChatExporter.Cli/Commands/GuideCommand.cs b/DiscordChatExporter.Cli/Commands/GuideCommand.cs
index 07238de8e..81318b6f9 100644
--- a/DiscordChatExporter.Cli/Commands/GuideCommand.cs
+++ b/DiscordChatExporter.Cli/Commands/GuideCommand.cs
@@ -13,7 +13,7 @@ public ValueTask ExecuteAsync(IConsole console)
     {
         // User token
         using (console.WithForegroundColor(ConsoleColor.White))
-            console.Output.WriteLine("To get user token:");
+            console.Output.WriteLine("To get the token for your personal account:");
 
         console
             .Output
@@ -34,7 +34,7 @@ public ValueTask ExecuteAsync(IConsole console)
 
         // Bot token
         using (console.WithForegroundColor(ConsoleColor.White))
-            console.Output.WriteLine("To get bot token:");
+            console.Output.WriteLine("To get the token for your bot:");
 
         console.Output.WriteLine(" 1. Go to Discord developer portal");
         console.Output.WriteLine(" 2. Open your application's settings");
@@ -43,13 +43,13 @@ public ValueTask ExecuteAsync(IConsole console)
         console
             .Output
             .WriteLine(
-                " *  Your bot needs to have Message Content Intent enabled to read messages"
+                " *  Your bot needs to have the Message Content Intent enabled to read messages"
             );
         console.Output.WriteLine();
 
         // Guild or channel ID
         using (console.WithForegroundColor(ConsoleColor.White))
-            console.Output.WriteLine("To get guild ID or channel ID:");
+            console.Output.WriteLine("To get the ID of a guild or a channel:");
 
         console.Output.WriteLine(" 1. Open Discord");
         console.Output.WriteLine(" 2. Open Settings");
@@ -64,13 +64,18 @@ public ValueTask ExecuteAsync(IConsole console)
 
         // Docs link
         using (console.WithForegroundColor(ConsoleColor.White))
+        {
             console
                 .Output
                 .WriteLine("If you have questions or issues, please refer to the documentation:");
+        }
+
         using (console.WithForegroundColor(ConsoleColor.DarkCyan))
+        {
             console
                 .Output
                 .WriteLine("https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs");
+        }
 
         return default;
     }
diff --git a/DiscordChatExporter.Gui/Views/Components/DashboardView.xaml b/DiscordChatExporter.Gui/Views/Components/DashboardView.xaml
index 9b887e82b..4d7d031f2 100644
--- a/DiscordChatExporter.Gui/Views/Components/DashboardView.xaml
+++ b/DiscordChatExporter.Gui/Views/Components/DashboardView.xaml
@@ -166,44 +166,55 @@
                         <Run
                             FontSize="16"
                             FontWeight="SemiBold"
-                            Text="To get token for your personal account:" />
+                            Text="To get the token for your personal account:" />
                         <LineBreak />
+
                         <Run Text="*  Automating user accounts is technically against TOS —" />
                         <Run FontWeight="SemiBold" Text="use at your own risk" /><Run Text="!" />
                         <LineBreak />
+
                         <Run Text="1. Open Discord in your" />
                         <Hyperlink Command="{s:Action OpenDiscord}">
                             <Run Text="web browser" />
                         </Hyperlink>
                         <Run Text="and login" />
                         <LineBreak />
+
                         <Run Text="2. Open any server or direct message channel" />
                         <LineBreak />
+
                         <Run Text="3. Press" />
                         <Run FontWeight="SemiBold" Text="Ctrl+Shift+I" />
                         <Run Text="to show developer tools" />
                         <LineBreak />
+
                         <Run Text="4. Navigate to the" />
                         <Run FontWeight="SemiBold" Text="Network" />
                         <Run Text="tab" />
                         <LineBreak />
+
                         <Run Text="5. Press" />
                         <Run FontWeight="SemiBold" Text="Ctrl+R" />
                         <Run Text="to reload" />
                         <LineBreak />
+
                         <Run Text="6. Switch between random channels to trigger network requests" />
                         <LineBreak />
+
                         <Run Text="7. Search for a request that starts with" />
                         <Run FontWeight="SemiBold" Text="messages" />
                         <LineBreak />
+
                         <Run Text="8. Select the" />
                         <Run FontWeight="SemiBold" Text="Headers" />
                         <Run Text="tab on the right" />
                         <LineBreak />
+
                         <Run Text="9. Scroll down to the" />
                         <Run FontWeight="SemiBold" Text="Request Headers" />
                         <Run Text="section" />
                         <LineBreak />
+
                         <Run Text="10. Copy the value of the" />
                         <Run FontWeight="SemiBold" Text="authorization" />
                         <Run Text="header" />
@@ -220,25 +231,30 @@
                         <Run
                             FontSize="16"
                             FontWeight="SemiBold"
-                            Text="To get token for a bot account:" />
+                            Text="To get the token for your bot:" />
                         <LineBreak />
+
                         <Run Text="1. Open Discord" />
                         <Hyperlink Command="{s:Action OpenDiscordDeveloperPortal}">
                             <Run Text="developer portal" />
                         </Hyperlink>
                         <LineBreak />
+
                         <Run Text="2. Open your application's settings" />
                         <LineBreak />
+
                         <Run Text="3. Navigate to the" />
                         <Run FontWeight="SemiBold" Text="Bot" />
                         <Run Text="section on the left" />
                         <LineBreak />
+
                         <Run Text="4. Under" />
                         <Run FontWeight="SemiBold" Text="Token" />
                         <Run Text="click" />
                         <Run FontWeight="SemiBold" Text="Copy" />
                         <LineBreak />
-                        <Run Text="*  Your bot needs to have" />
+
+                        <Run Text="*  Your bot needs to have the" />
                         <Run FontWeight="SemiBold" Text="Message Content Intent" />
                         <Run Text="enabled to read messages" />
                         <LineBreak />
diff --git a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
index 977444629..aa25989cd 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml
@@ -89,8 +89,9 @@
                             <TextBox.ToolTip>
                                 <TextBlock>
                                     <Run Text="Output file or directory path." />
-                                    <Run Text="If a directory is specified, file names will be generated automatically based on the channel names and other parameters." />
-                                    <Run Text="Directory path should end with a slash to avoid ambiguity." />
+                                    <Run Text="If a directory is specified, file names will be generated automatically based on the channel names and export parameters." />
+                                    <Run Text="Directory paths must end with a slash to avoid ambiguity." />
+                                    <Run Text="Supports template tokens, see the documentation for more info." />
                                     <LineBreak />
                                     <LineBreak />
                                     <Run Text="Available template tokens:" />
@@ -232,7 +233,7 @@
                             materialDesign:HintAssist.IsFloating="True"
                             Style="{DynamicResource MaterialDesignOutlinedTextBox}"
                             Text="{Binding MessageFilterValue}"
-                            ToolTip="Only include messages that satisfy this filter (e.g. 'from:foo#1234' or 'has:image')" />
+                            ToolTip="Only include messages that satisfy this filter (e.g. 'from:foo#1234' or 'has:image'). See the documentation for more info." />
 
                         <!--  Markdown formatting  -->
                         <Grid Margin="16,8" ToolTip="Process markdown, mentions, and other special tokens">