diff --git a/docs/contributing.org b/docs/contributing.org
index 66c533d3a..b3037780a 100644
--- a/docs/contributing.org
+++ b/docs/contributing.org
@@ -162,6 +162,7 @@ improvements, tutorials and/or articles to submit, don't hesitate to get in
 contact via our [[https://discord.gg/bcZ6P3y][Discord server]] or [[mailto:henrik@lissner.net][email]]. I appreciate any help I can get!
 
 ** TODO Contributing to Doom's manual
+
 ** TODO Contributing module documentation
 
 * TODO Other ways to support Doom Emacs
diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 7bbe24af7..803982411 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -304,7 +304,7 @@
         :desc "Jump to symbol"                "i" #'imenu
         :desc "Jump to link"                  "l" #'ace-link
         :desc "jump list"                     "j" #'evil-show-jumps
-        :desc "Jump to mark"                  "m"   #'evil-show-marks
+        :desc "Jump to mark"                  "m" #'evil-show-marks
         :desc "Look up online"                "o" #'+lookup/online
         :desc "Look up online (w/ prompt)"    "O" #'+lookup/online-select
         :desc "Look up in local docsets"      "k" #'+lookup/in-docsets
diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el
index ccde1b011..004760569 100644
--- a/modules/lang/org/autoload/org.el
+++ b/modules/lang/org/autoload/org.el
@@ -437,6 +437,6 @@ unfold to point on startup."
 ;;;###autoload
 (defun +org-enable-auto-update-cookies-h ()
   "Update statistics cookies when saving or exiting insert mode (`evil-mode')."
-  (when (featurep 'evil)
+  (when (bound-and-true-p evil-local-mode)
     (add-hook 'evil-insert-state-exit-hook #'+org-update-cookies-h nil t))
   (add-hook 'before-save-hook #'+org-update-cookies-h nil t))
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 8528703f3..0e4b6e06d 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -111,7 +111,7 @@ path too.")
         ;; Without this, completers like ivy/helm are only given the first level of
         ;; each outline candidates. i.e. all the candidates under the "Tasks" heading
         ;; are just "Tasks/". This is unhelpful. We want the full path to each refile
-        ;; target! e.g. FILE/Task/heading/subheading
+        ;; target! e.g. FILE/Tasks/heading/subheading
         org-refile-use-outline-path 'file
         org-outline-path-complete-in-steps nil)
 
@@ -122,12 +122,11 @@ path too.")
     (defun +org-refresh-latex-background ()
       "Previews are usually rendered with light backgrounds, so ensure their
 background (and foreground) match the current theme."
-      (setq org-format-latex-options
-            (plist-put org-format-latex-options
-                       :background
-                       (face-attribute (or (cadr (assq 'default face-remapping-alist))
-                                           'default)
-                                       :background nil t)))))
+      (plist-put! org-format-latex-options
+                  :background
+                  (face-attribute (or (cadr (assq 'default face-remapping-alist))
+                                      'default)
+                                  :background nil t))))
 
   ;; HACK Face specs fed directly to `org-todo-keyword-faces' don't respect
   ;;      underlying faces like the `org-todo' face does, so we define our own
@@ -164,7 +163,7 @@ background (and foreground) match the current theme."
           (format "Link: %s" link))
         (apply orig-fn args)))
 
-  ;; Don't do automatic indent detection in org files
+  ;; Automatic indent detection in org files is meaningless
   (cl-pushnew 'org-mode doom-detect-indentation-excluded-modes :test #'eq)
 
   (set-pretty-symbols! 'org-mode