diff --git a/main.go b/main.go
index b5e4a7e..d1f2a19 100644
--- a/main.go
+++ b/main.go
@@ -85,7 +85,7 @@ func main() {
 		case "fish":
 			fmt.Printf(`function _llm_shell_hint
     set -l LLM_SUGGESTION_FILE (mktemp)
-    llm-shell-hint %s --output $LLM_SUGGESTION_FILE query (commandline -b)
+    llm-shell-hint %s query --output $LLM_SUGGESTION_FILE (commandline -b)
     set -l LLM_SUGGESTION (cat $LLM_SUGGESTION_FILE)
     rm $LLM_SUGGESTION_FILE
 
@@ -102,7 +102,7 @@ bind ctrl-q _llm_shell_hint
 		case "bash":
 			fmt.Printf(`_llm_shell_hint() {
     local suggestion_file=$(mktemp)
-    llm-shell-hint %s --output "$suggestion_file" query -- "$READLINE_LINE"
+    llm-shell-hint %s query --output "$suggestion_file" -- "$READLINE_LINE"
     local suggestion=$(<"$suggestion_file")
     rm "$suggestion_file"
 
diff --git a/tui.go b/tui.go
index 142ed93..ac58192 100644
--- a/tui.go
+++ b/tui.go
@@ -69,7 +69,6 @@ func initialModel(config *Config, query string, verbose bool) model {
 
 	l := list.New([]list.Item{}, delegate, width, 20)
 	l.SetShowTitle(false)
-	l.SetShowHelp(false)
 	l.SetShowStatusBar(false)
 	l.SetFilteringEnabled(false)
 	l.Title = "" // Set empty title
@@ -86,7 +85,7 @@ func initialModel(config *Config, query string, verbose bool) model {
 		query:   query,
 		verbose: verbose,
 		loading: true,
-		status:  "Querying",
+		status:  "Initializing...",
 		spinner: sp,
 		list:    l,
 	}
@@ -115,7 +114,10 @@ func (m model) Init() tea.Cmd {
 	return tea.Batch(
 		m.spinner.Tick,
 		func() tea.Msg {
+			m.status = "Building prompt..."
 			prompt := buildPrompt(m.config, m.query)
+			
+			m.status = "Querying LLM..."
 			commands, err := queryLLM(m.config, prompt, m.verbose)
 			if err != nil {
 				return err