diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el
index bfa3f0c40..55e91c800 100644
--- a/modules/feature/evil/config.el
+++ b/modules/feature/evil/config.el
@@ -292,9 +292,8 @@ the new algorithm is confusing, like in python or ruby."
   (global-evil-mc-mode +1)
 
   ;; Add custom commands to whitelisted commands
-  (dolist (fn '(doom/deflate-space-maybe doom/inflate-space-maybe
-                doom/backward-to-bol-or-indent doom/forward-to-last-non-comment-or-eol
-                doom/backward-kill-to-bol-and-indent doom/newline-and-indent))
+  (dolist (fn '(doom/backward-to-bol-or-indent doom/forward-to-last-non-comment-or-eol
+                doom/backward-kill-to-bol-and-indent))
     (push (cons fn '((:default . evil-mc-execute-default-call)))
           evil-mc-custom-known-commands))
 
diff --git a/modules/lang/csharp/config.el b/modules/lang/csharp/config.el
index c994c4e07..6b795a629 100644
--- a/modules/lang/csharp/config.el
+++ b/modules/lang/csharp/config.el
@@ -2,6 +2,8 @@
 
 (def-package! csharp-mode :mode "\\.cs$")
 
+(def-package! shader-mode :mode "\\.shader$") ; unity shaders
+
 
 (def-package! omnisharp
   :after csharp-mode
@@ -54,6 +56,3 @@
           :n "s" (λ! (omnisharp-unit-test "single"))
           :n "a" (λ! (omnisharp-unit-test "all")))))
 
-
-(def-package! shader-mode :mode "\\.shader$") ; unity shaders
-
diff --git a/modules/lang/data/config.el b/modules/lang/data/config.el
index b01d00d6f..7071a7b88 100644
--- a/modules/lang/data/config.el
+++ b/modules/lang/data/config.el
@@ -34,8 +34,7 @@
   :mode "/Dockerfile$")
 
 
-;; For ROM hacking or debugging
-(def-package! hexl
+(def-package! hexl ; For ROM hacking or debugging
   :mode ("\\.hex$" . hexl-mode)
   :mode ("\\.nes$" . hexl-mode))
 
diff --git a/modules/lang/ess/autoloads.el b/modules/lang/ess/autoloads.el
index 44bafc685..c7c4b0fb4 100644
--- a/modules/lang/ess/autoloads.el
+++ b/modules/lang/ess/autoloads.el
@@ -1,4 +1,5 @@
 ;;; private/r/autoload.el -*- lexical-binding: t; -*-
+
 ;;;###autoload
 (defun +r/repl ()
   "Open the R REPL."
diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index 2ee312cc7..f8f6830c6 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -20,7 +20,7 @@
   (defvaralias 'js-switch-indent-offset 'js2-basic-offset)
 
   (sp-with-modes '(js2-mode rjsx-mode)
-    (sp-local-pair "/* " " */" :post-handlers '(("| " "SPC"))))
+    (sp-local-pair "/*" "*/" :post-handlers '(("| " "SPC"))))
 
   ;; If it's available globally, use eslint_d
   (setq flycheck-javascript-eslint-executable (executable-find "eslint_d"))
diff --git a/modules/lang/latex/config.el b/modules/lang/latex/config.el
index 21f085df2..550750024 100644
--- a/modules/lang/latex/config.el
+++ b/modules/lang/latex/config.el
@@ -21,8 +21,8 @@
 
 (def-package! tex-site
   :init
-  ;; Manually load the AUCTEX autoloads. This is normally done by package-initialize,
-  ;; ... which we do not use.
+  ;; Manually load the AUCTEX autoloads. This is normally done by
+  ;; package-initialize, ... which we do not use.
   (load "auctex.el" nil t t)
   (load "auctex-autoloads.el" nil t t)
   :config
@@ -38,7 +38,8 @@
         ;; Use hidden directories for AUCTeX files.
         TeX-auto-local ".auctex-auto"
         TeX-style-local ".auctex-style"
-        ;; When correlating sources to rendered PDFs, don't start the emacs server
+        ;; When correlating sources to rendered PDFs, don't start the emacs
+        ;; server
         TeX-source-correlate-start-server nil
         TeX-source-correlate-mode t
         TeX-source-correlate-method 'synctex
@@ -74,7 +75,8 @@
      LaTeX-item-indent 0)
     :config
     (map! :map LaTeX-mode-map "C-j" nil)
-    ;; Do not prompt for Master files, this allows auto-insert to add templates to .tex files
+    ;; Do not prompt for Master files, this allows auto-insert to add templates
+    ;; to .tex files
     (add-hook! '(LaTeX-mode TeX-mode) '(lambda () (remove-hook 'find-file-hooks (car find-file-hooks) 'local)))
     ;; Adding useful things for latex
     (add-hook! LaTeX-mode (LaTeX-math-mode) (TeX-source-correlate-mode)(TeX-global-PDF-mode t)
@@ -95,7 +97,8 @@
 (after! latex
   ;; Use Okular is the user says so.
   (when (featurep! +okular)
-    ;; Configure Okular as viewer. Including a bug fix (https://bugs.kde.org/show_bug.cgi?id=373855)
+    ;; Configure Okular as viewer. Including a bug fix
+    ;; (https://bugs.kde.org/show_bug.cgi?id=373855)
     (add-to-list 'TeX-view-program-list
                  '("Okular" ("okular --unique file:%o" (mode-io-correlate "#src:%n%a"))))
     (add-to-list 'TeX-view-program-selection
@@ -110,8 +113,9 @@
 
 
 (def-package! preview
-  ;; The preview package is currently broken with the latest AUCTeX version ("11.90.2.2017-07-25)
-  ;; ... and Ghostscript 9.22. It's now fixed in AUCTeX master, so we just have to wait.
+  ;; The preview package is currently broken with the latest AUCTeX version
+  ;; ("11.90.2.2017-07-25) ... and Ghostscript 9.22. It's now fixed in AUCTeX
+  ;; master, so we just have to wait.
   :init
   (progn
     (setq-default preview-scale 1.4
@@ -175,7 +179,8 @@
         "q"   #'delete-window
         "k" (λ! (quit-window) (delete-window))))
 
-;; Enable latexmk only if the user explicitly says so with the module flag '+latexmk'.
+;; Enable latexmk only if the user explicitly says so with the module flag
+;; '+latexmk'.
 (def-package! auctex-latexmk
   :when (featurep! +latexmk)
   :init
@@ -219,8 +224,8 @@
   :commands (company-auctex-init)
   :init
   ;; We can't use the (set! :company-backend ...) because Auctex reports its
-  ;; major-mode as `latex-mode', but uses LaTeX-mode-hook for its mode, which
-  ;; is not anticipated by :company-backend (and shouldn't have to!)
+  ;; major-mode as `latex-mode', but uses LaTeX-mode-hook for its mode, which is
+  ;; not anticipated by :company-backend (and shouldn't have to!)
   (add-hook! LaTeX-mode
     (make-variable-buffer-local 'company-backends)
     (company-auctex-init)))
diff --git a/modules/lang/markdown/config.el b/modules/lang/markdown/config.el
index 9c7293b0c..de879f12f 100644
--- a/modules/lang/markdown/config.el
+++ b/modules/lang/markdown/config.el
@@ -2,8 +2,8 @@
 
 (def-package! markdown-mode
   :mode "/README$"
-  :mode "\\.m\\(d\\|arkdown\\)$"
   :mode ("/README\\.md$" . gfm-mode)
+  :mode "\\.m\\(d\\|arkdown\\)$"
   :init
   (setq markdown-enable-wiki-links t
         markdown-enable-math t
diff --git a/modules/tools/password-store/config.el b/modules/tools/password-store/config.el
index 5463b4112..1609dab0b 100644
--- a/modules/tools/password-store/config.el
+++ b/modules/tools/password-store/config.el
@@ -36,6 +36,7 @@
 
 
 ;; Is built into Emacs 26+
+;; TODO don't add password-store to auth-sources?
 (if (require 'auth-store-pass nil t)
     (auth-source-pass-enable)
   (def-package! auth-password-store
diff --git a/modules/tools/rotate-text/config.el b/modules/tools/rotate-text/config.el
index 488ce72a7..5fb81df5a 100644
--- a/modules/tools/rotate-text/config.el
+++ b/modules/tools/rotate-text/config.el
@@ -7,7 +7,8 @@
 
 
 (def-setting! :rotate (modes &rest plist)
-  "Declare :symbols, :words or :patterns that `rotate-text' will cycle through."
+  "Declare :symbols, :words or :patterns (all lists of strings) that
+`rotate-text' will cycle through."
   (declare (indent 1))
   (let* ((modes (doom-enlist (doom-unquote modes)))
          (fn-name (intern (format "doom--rotate-%s" (mapconcat #'symbol-name modes "-")))))