diff --git a/core/core.el b/core/core.el
index 98c806e26..ad8256de3 100644
--- a/core/core.el
+++ b/core/core.el
@@ -247,8 +247,8 @@ users).")
 ;; Don't ping things that look like domain names.
 (setq ffap-machine-p-known 'reject)
 
-;; Performance on Windows is considerably worse than elsewhere. We'll need
-;; everything we can get.
+;; Performance on Windows is considerably worse than elsewhere, especially if
+;; WSL is involved. We'll need everything we can get.
 (when IS-WINDOWS
   ;; Reduce the workload when doing file IO
   (setq w32-get-true-file-attributes nil)
@@ -258,13 +258,13 @@ users).")
   ;; been determined.
   (setq inhibit-compacting-font-caches t))
 
-;; Remove command line options that aren't relevant to our current OS; that
-;; means less to process at startup.
+;; Remove command line options that aren't relevant to our current OS; means
+;; slightly less to process at startup.
 (unless IS-MAC   (setq command-line-ns-option-alist nil))
 (unless IS-LINUX (setq command-line-x-option-alist nil))
 
 ;; Adopt a sneaky garbage collection strategy of waiting until idle time to
-;; collect and staving off the collector while the user is working.
+;; collect; staving off the collector while the user is working.
 (when doom-interactive-mode
   (add-transient-hook! 'pre-command-hook (gcmh-mode +1))
   (with-eval-after-load 'gcmh
@@ -377,9 +377,7 @@ If this is a daemon session, load them all immediately instead."
 ;;; Bootstrap helpers
 
 (defun doom-try-run-hook (hook)
-  "Run HOOK (a hook function), but handle errors better, to make debugging
-issues easier.
-
+  "Run HOOK (a hook function) with better error handling.
 Meant to be used with `run-hook-wrapped'."
   (doom-log "Running doom hook: %s" hook)
   (condition-case e
@@ -406,8 +404,7 @@ If RETURN-P, return the message as a string instead of displaying it."
   "Tries to load FILE (an autoloads file).
 Return t on success, nil otherwise (but logs a warning)."
   (condition-case e
-      (let (command-switch-alist)
-        (load (substring file 0 -3) noerror 'nomessage))
+      (load (substring file 0 -3) noerror 'nomessage)
     ((debug error)
      (message "Autoload file error: %s -> %s" (file-name-nondirectory file) e)
      nil)))
@@ -415,8 +412,7 @@ Return t on success, nil otherwise (but logs a warning)."
 (defun doom-load-envvars-file (file &optional noerror)
   "Read and set envvars from FILE.
 If NOERROR is non-nil, don't throw an error if the file doesn't exist or is
-unreadable. Returns a list of VAR=VALUE strings for all environment variables
-set."
+unreadable. Returns the names of envvars that were changed."
   (if (not (file-readable-p file))
       (unless noerror
         (signal 'file-error (list "Couldn't read envvar file" file)))
diff --git a/init.el b/init.el
index 4ddc67d78..ce908b1b2 100644
--- a/init.el
+++ b/init.el
@@ -35,7 +35,7 @@
 
 ;; In noninteractive sessions, prioritize non-byte-compiled source files to
 ;; prevent the use of stale byte-code. Otherwise, it saves us a little IO time
-;; to skip the mtime checks on every *.elc file we load.
+;; to skip the mtime checks on every *.elc file.
 (setq load-prefer-newer noninteractive)
 
 (let (file-name-handler-alist)
diff --git a/modules/app/regex/config.el b/modules/app/regex/config.el
index f48488d01..595d619e4 100644
--- a/modules/app/regex/config.el
+++ b/modules/app/regex/config.el
@@ -49,4 +49,3 @@ https://mediatemple.net"
 (set-popup-rules!
  '(("^\\*doom-regex\\*$" :size 4 :quit nil)
    ("^\\*doom-regex-groups" :side 'left :size 28 :select nil :quit nil)))
-
diff --git a/modules/completion/helm/config.el b/modules/completion/helm/config.el
index a7c8162ca..84b68f738 100644
--- a/modules/completion/helm/config.el
+++ b/modules/completion/helm/config.el
@@ -125,6 +125,7 @@ be negative.")
 
 
 (after! helm-rg
+  (setq helm-rg-display-buffer-normal-method #'pop-to-buffer)
   (set-popup-rule! "^helm-rg-" :ttl nil :select t :size 0.45)
   (map! :map helm-rg-map
         "C-c C-e" #'helm-rg--bounce)
diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el
index 31ca4eb4b..a5f5f7125 100644
--- a/modules/completion/ivy/config.el
+++ b/modules/completion/ivy/config.el
@@ -128,6 +128,8 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
 (use-package! ivy-rich
   :after ivy
   :config
+  (setq ivy-rich-parse-remote-buffer nil)
+
   (when (featurep! +icons)
     (cl-pushnew '(+ivy-rich-buffer-icon)
                 (cadr (plist-get ivy-rich-display-transformers-list
diff --git a/modules/lang/java/config.el b/modules/lang/java/config.el
index e4818df76..4b04f3dff 100644
--- a/modules/lang/java/config.el
+++ b/modules/lang/java/config.el
@@ -46,4 +46,3 @@ If the depth is 2, the first two directories are removed: net.lissner.game.")
   :mode "\\.g\\(?:radle\\|roovy\\)$"
   :config
   (set-eval-handler! 'groovy-mode "groovy"))
-
diff --git a/modules/lang/solidity/README.org b/modules/lang/solidity/README.org
index e0800b5a8..d91d419f3 100644
--- a/modules/lang/solidity/README.org
+++ b/modules/lang/solidity/README.org
@@ -7,11 +7,11 @@ This module adds [[https://github.com/ethereum/solidity][Solidity]] support thro
 + Gas estimation (~C-c C-g~)
 
 * Table of Contents :TOC:
-- [[Module Flags][Module Flags]]
-- [[Prerequisites][Prerequisites]]
-  - [[Solc][Solc]]
-  - [[Solium][Solium]]
-- [[TODO][TODO]]
+- [[#module-flags][Module Flags]]
+- [[#prerequisites][Prerequisites]]
+  - [[#solc][Solc]]
+  - [[#solium][Solium]]
+- [[#todo][TODO]]
 
 * Module Flags
 This module provides no flags.
diff --git a/modules/term/vterm/config.el b/modules/term/vterm/config.el
index c5d155b6b..046ae33d9 100644
--- a/modules/term/vterm/config.el
+++ b/modules/term/vterm/config.el
@@ -1,7 +1,7 @@
 ;;; term/vterm/config.el -*- lexical-binding: t; -*-
 
 (use-package! vterm
-  :when (fboundp 'module-load)
+  :when module-file-suffix
   :defer t
   :preface (setq vterm-install t)
   :config
diff --git a/modules/ui/popup/+hacks.el b/modules/ui/popup/+hacks.el
index ae046ae96..ee20515db 100644
--- a/modules/ui/popup/+hacks.el
+++ b/modules/ui/popup/+hacks.el
@@ -199,13 +199,6 @@ the command buffer."
                  (setq win (get-buffer-window (get-buffer (help-buffer)))))
         (delete-window win))))
 
-  ;; `helm-ag'
-  (defadvice! +popup--helm-pop-to-buffer-a (orig-fn &rest args)
-    :around #'helm-ag--edit
-    (pop-to-buffer
-     (save-window-excursion (apply orig-fn args)
-                            (current-buffer)))))
-
 
 ;;;###package Info
 (defadvice! +popup--switch-to-info-window-a (&rest _)