diff --git a/bin/doom b/bin/doom
index f1c5eb740..c6d0d7ba6 100755
--- a/bin/doom
+++ b/bin/doom
@@ -91,11 +91,11 @@
     (doom-initialize 'force-p)
     (doom-initialize-modules)
 
-    (cond ((and (not (cdr args))
-                (member (car args) '("help" "h")))
-           (usage))
-          ((not args)
-           (print! (error "No command detected.\n"))
+    (cond ((or (not args)
+               (and (not (cdr args))
+                    (member (car args) '("help" "h"))))
+           (unless args
+             (print! (error "No command detected.\n")))
            (usage))
           ((require 'core-cli)
            (let ((default-directory user-emacs-directory))
diff --git a/core/cli/packages.el b/core/cli/packages.el
index 2483f8b2b..e9ff95f99 100644
--- a/core/cli/packages.el
+++ b/core/cli/packages.el
@@ -126,7 +126,7 @@ a list of packages that will be installed."
                            (lambda (&rest _) (cl-incf n)))
                  (let ((straight--packages-to-rebuild :all)
                        (straight--packages-not-to-rebuild (make-hash-table :test #'equal)))
-                   (straight-use-package (intern package) nil nil " "))
+                   (straight-use-package (intern package) nil nil "  "))
                  (straight--byte-compile-package recipe)
                  (dolist (dep (straight--get-dependencies package))
                    (when-let (recipe (gethash dep straight--recipe-cache))
diff --git a/modules/editor/multiple-cursors/autoload/evil-mc.el b/modules/editor/multiple-cursors/autoload/evil-mc.el
index c4ca6cd46..036d7547e 100644
--- a/modules/editor/multiple-cursors/autoload/evil-mc.el
+++ b/modules/editor/multiple-cursors/autoload/evil-mc.el
@@ -5,6 +5,8 @@
 (defun +multiple-cursors/evil-mc-toggle-cursors ()
   "Toggle frozen state of evil-mc cursors."
   (interactive)
+  (unless (evil-mc-has-cursors-p)
+    (user-error "No cursors exist to be toggled"))
   (setq evil-mc-frozen (not (and (evil-mc-has-cursors-p)
                                  evil-mc-frozen)))
   (if evil-mc-frozen
diff --git a/modules/editor/snippets/autoload/settings.el b/modules/editor/snippets/autoload/settings.el
index 09880ed66..f83a8df9d 100644
--- a/modules/editor/snippets/autoload/settings.el
+++ b/modules/editor/snippets/autoload/settings.el
@@ -5,6 +5,6 @@
   "Register minor MODES (one mode symbol or a list of them) with yasnippet so it
 can have its own snippets category, if the folder exists."
   (dolist (mode (doom-enlist modes))
-    (let ((fn (intern (format "+snippets|register-%s" mode))))
+    (let ((fn (intern (format "+snippets-register-%s-h" mode))))
       (fset fn (lambda () (yas-activate-extra-mode mode)))
       (add-hook (intern (format "%s-hook" mode)) fn))))
diff --git a/modules/emacs/dired/config.el b/modules/emacs/dired/config.el
index 8c882b36e..0fab59283 100755
--- a/modules/emacs/dired/config.el
+++ b/modules/emacs/dired/config.el
@@ -24,7 +24,7 @@
       ;; Use GNU ls as `gls' from `coreutils' if available. Add `(setq
       ;; dired-use-ls-dired nil)' to your config to suppress the Dired warning
       ;; when not using GNU ls.
-      (if-let* ((gls (executable-find "gls")))
+      (if-let (gls (executable-find "gls"))
           (setq insert-directory-program gls)
         ;; BSD ls doesn't support --group-directories-first
         (setq args (delete "--group-directories-first" args))))
diff --git a/modules/lang/markdown/config.el b/modules/lang/markdown/config.el
index 2f41a7a9f..37608ce5f 100644
--- a/modules/lang/markdown/config.el
+++ b/modules/lang/markdown/config.el
@@ -38,6 +38,7 @@ capture, the end position, and the output buffer.")
   (set-lookup-handlers! '(markdown-mode gfm-mode)
     :file #'markdown-follow-thing-at-point)
 
+  ;; Enable hard-wrapping. By convention, Doom does this for all textual modes.
   (add-hook 'markdown-mode-hook #'auto-fill-mode)
 
   ;; Prevent mis-fontification of YAML metadata blocks in `markdown-mode' which
diff --git a/modules/lang/sh/config.el b/modules/lang/sh/config.el
index 34af5d4d0..ba5dd49d4 100644
--- a/modules/lang/sh/config.el
+++ b/modules/lang/sh/config.el
@@ -8,7 +8,7 @@
 
 
 ;;
-;; Packages
+;;; Packages
 
 (use-package! sh-script ; built-in
   :mode ("\\.zunit\\'" . sh-mode)
@@ -43,7 +43,7 @@
               (2 'font-lock-variable-name-face prepend))
              (+sh--match-command-subst-in-quotes
               (1 'sh-quoted-exec prepend))
-             (,(regexp-opt +sh-builtin-keywords 'words)
+             (,(regexp-opt +sh-builtin-keywords 'symbols)
               (0 'font-lock-type-face append))))))
   ;; 4. Fontify delimiters by depth
   (add-hook 'sh-mode-hook #'rainbow-delimiters-mode)