diff --git a/CHANGELOG.org b/CHANGELOG.org
index 1584f6866..185cdf614 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -19,6 +19,11 @@
     selection/moving: ace-window and switch-window.
   + New module: =lang/nix=, adds support for editing nix configuration files.
     Contributed by [[https://github.com/ocharles][ocharles]].
+  + The =org/*= modules have been moved to =lang/org= and sub-modules therein.
+    With the introduction of module flags in 2.0.5, it was unnecessary that
+    org-mode had its own category.
+  + Any module can now have an =init.el=, which will be loaded before any other
+    modules are loaded.
 + =general=
   + New command naming convention: ~doom//...~ -- denotes that this an
     interactive command meant for:
@@ -30,6 +35,8 @@
   + Autoload files can now specify a predicate cookie to tell the
     compiler/autoload reader whether or not to ignore that file. They look like
     ~;;;###if (featurep! :feature evil)~.
+  + =private/{user-login-name}= is no longer a "magic" module that is
+    automatically loaded.
   + =core-keybinds= Add :g flag to ~map!~ for defining global keybinds along
     with vim keybinds, so you don't have to repeat yourself, just for a global
     binding.
@@ -38,10 +45,28 @@
     (e.g. ELPA), and whose ~package!~ definition was later changed so that it
     should be handled by another (e.g. QUELPA). This would cause "FAILED" error
     messages while trying to install or update these packages (see [[https://github.com/hlissner/doom-emacs/issues/222][#222]]).
+  + =core-packages= *BREAKING* Packages are no longer deferred by default. i.e.
+    ~use-package-always-defer~ is now nil, as per the default.
+  + =core-popup= Fix window-live-p error when using ~doom/other-popup~ (or its
+    alias, ~other-popup~).
+  + Removed all core def-setting! definitions, because ~set!~ was intended for
+    cross-module configuration, where modules may or may not be enabled. This
+    consideration is unnecessary for Doom core configuration. The following
+    settings have been removed: ~:editorconfig~, ~:theme~, ~:font~,
+    ~:variable-font~, ~:unicode-font~, ~:big-font~.
 + =feature=
   + =file-templates= Disable file templates for .dir-locals.el files.
   + =jump= New command ~+jump/online-select~, which is like ~+jump/online~, but
     will always prompt for which provider to use.
+  + =version-control= Possibly fix an issue with magit placing the pointer in
+    the wrong places when multiple magit popups appear (e.g. when you try to
+    commit, and the commit message and diff buffers pop up, the pointer can get
+    stuck in the diff window) (see [[https://github.com/hlissner/doom-emacs/issues/282][#282]]).
++ =completion=
+  + =helm= Implement ~:agcwd~, ~:rg~, and ~:rgcwd~ commands for searching with
+    helm.
+  + =ivy= C-SPC is now the default keybinding for "previewing" the selected
+    candidate. This keybinding is defined in =private/hlissner/+bindings.el=.
 + =ui=
   + =doom= This module no longer sets a default font. This is left to the user
     to set in their own private module. Use ~(set! :font "Font Name" :size N)~
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 2025d25cc..e52e9a97f 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -79,7 +79,19 @@
       (ignore-errors
         (save-excursion
           (outline-previous-visible-heading 1)
-          (org-show-subtree))))))
+          (org-show-subtree)))))
+
+  (defun +org-sp-point-in-checkbox-p (_id action _context)
+    (when (eq action 'insert)
+      (sp--looking-at-p "\\s-*]")))
+
+  ;; make delimiter auto-closing a little more conservative
+  (sp-with-modes 'org-mode
+    (sp-local-pair "*" nil :unless '(sp-point-after-word-p sp-point-before-word-p sp-point-at-bol-p))
+    (sp-local-pair "_" nil :unless '(sp-point-after-word-p sp-point-before-word-p))
+    (sp-local-pair "/" nil :unless '(sp-point-after-word-p sp-point-before-word-p +org-sp-point-in-checkbox-p))
+    (sp-local-pair "~" nil :unless '(sp-point-after-word-p sp-point-before-word-p))
+    (sp-local-pair "=" nil :unless '(sp-point-after-word-p sp-point-before-word-p))))
 
 ;;
 (defun +org-init-ui ()