diff --git a/core/core-editor.el b/core/core-editor.el
index b804ed81a..189ca880b 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -72,15 +72,16 @@ fundamental-mode) for performance sake."
 
 
 ;;
-;; Built-in plugins
+;; Extra file extensions to support
 
 (push '("/LICENSE\\'" . text-mode) auto-mode-alist)
 
-(electric-indent-mode -1) ; enabled by default in Emacs 25+. No thanks.
+
+;;
+;; Built-in plugins
 
 (def-package! server
   :when (display-graphic-p)
-  :defer 1
   :after-call (pre-command-hook after-find-file)
   :config
   (when-let* ((name (getenv "EMACS_SERVER_NAME")))
diff --git a/init.example.el b/init.example.el
index bbcb124b9..c72d6b6e1 100644
--- a/init.example.el
+++ b/init.example.el
@@ -68,8 +68,8 @@
        ;;ein               ; tame Jupyter notebooks with emacs
        ;;gist              ; interacting with github gists
        ;;macos             ; MacOS-specific commands
-       ;;make              ; run make tasks from Emacs
        ;;magit             ; a git porcelain for Emacs
+       ;;make              ; run make tasks from Emacs
        ;;password-store    ; password manager for nerds
        ;;pdf               ; pdf enhancements
        ;;prodigy           ; FIXME managing external services & code builders
diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el
index 1e79a20f4..5ddf6850c 100644
--- a/modules/lang/clojure/config.el
+++ b/modules/lang/clojure/config.el
@@ -85,7 +85,8 @@
                 "c" #'cider-repl-clear-buffer)))
 
           (:when (featurep! :feature evil +everywhere)
-            :map cider-repl-mode-map :i [S-return] #'cider-repl-newline-and-indent
+            :map cider-repl-mode-map
+            :i [S-return] #'cider-repl-newline-and-indent
             :map cider-repl-history-mode-map
             :i [return]  #'cider-repl-history-insert-and-quit
             :i "q"  #'cider-repl-history-quit
diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el
index a09d3bbe1..0060dd2fb 100644
--- a/modules/tools/magit/config.el
+++ b/modules/tools/magit/config.el
@@ -38,7 +38,7 @@
 
 
 (def-package! forge
-  ;; we defer loading even further because forge's dependencies will try to
+  ;; We defer loading even further because forge's dependencies will try to
   ;; compile emacsql, which is a slow and blocking operation.
   :after-call magit-status
   :init