diff --git a/.config.d/05-basic.el b/.config.d/05-basic.el
index 5a66d7b..0662643 100644
--- a/.config.d/05-basic.el
+++ b/.config.d/05-basic.el
@@ -12,6 +12,7 @@
 ;; incomplete command (a prefix) in a popup.
 (use-package which-key
   :ensure t
+  :diminish which-key-mode
   :config
   (which-key-mode))
 
diff --git a/.config.d/07-org.el b/.config.d/07-org.el
index d6775b6..31b555d 100644
--- a/.config.d/07-org.el
+++ b/.config.d/07-org.el
@@ -1,5 +1,11 @@
 ;;; 07-org.el --- Setup org-mode. -*- no-byte-compile: t; lexical-binding: t; -*-
 
+;;; Description:
+;; This file contains the configuration for org mode and related packages.
+
+;;; Code:
+
+;; Org Mode the almighty
 (use-package org
   :ensure nil
   :defer nil
@@ -7,20 +13,41 @@
   :bind (:map org-mode-map
               ("C-c c" . org-fc-cloze-dwim)))
 
+;; By default, LaTeX rendered in org is too small. This makes is 2 times bigger.
 (setq org-format-latex-options (plist-put org-format-latex-options ':scale 2.0))
 
+;; This is a package that helps use org to manage knowledge. As the name
+;; suggests, it mimics the behavior of Roam Research.
 (use-package org-roam
   :ensure t
   :defer t
+  :after org-roam
   :commands (org-roam-node-insert
 	     org-roam-node-find
 	     org-roam-capture))
 
+;; This package provides us with a *very* nice graph of our knowledge base in
+;; our browser.
+(use-package org-roam-ui
+  :ensure t
+  :defer t
+  :diminish org-roam-ui-mode
+  :diminish org-roam-ui-follow-mode
+  :commands (org-roam-ui-mode))
+
+;; Auto Fill all org files.
 (add-hook 'org-mode-hook 'auto-fill-mode)
+
+;; Sometimes you gotta cite some sources, and that is where the bibliography
+;; comes in.
 (setq org-cite-global-bibliography
  '("/home/dizzar/data2/Notes/references/bibliography.bib"))
 
+;; This variable controls where org-roam will search for notes, and I store mine
+;; here.
 (setq org-roam-directory (file-truename "~/data2/Notes"))
+
+;; This tells org-roam to sync notes with its index in the background.
 (org-roam-db-autosync-mode)
 
 (setq global-roam-map (make-sparse-keymap "Roam Keys"))
@@ -39,6 +66,7 @@
       `(("s" "Slipbox" entry (file "~/data2/Notes/inbox.org")
 	 "* %?\n")))
 
+;; This package adds flashcard functionality to org files.
 (use-package org-fc
   :straight (org-fc
              :type git
diff --git a/post-init.el b/post-init.el
index 6767341..965bc49 100644
--- a/post-init.el
+++ b/post-init.el
@@ -30,6 +30,19 @@
   (compile-angel-on-load-mode)
   (add-hook 'emacs-lisp-mode-hook #'compile-angel-on-save-local-mode))
 
+;; Diminish allows us to clear up our modeline
+(use-package diminish
+  :ensure t)
+
+;; Since diminish was loaded after compile-angel, we cannot use the use-package
+;; integration to diminish it. So, we do it manually here.
+(diminish 'compile-angel-on-save-local-mode)
+(diminish 'compile-angel-on-load-mode)
+
+;; Since I did not explicitly install it, I cannot use the use-package
+;; integration to deminish eldoc either. So I do it explicitly here.
+(diminish 'eldoc-mode)
+
 ;; Load the configs from plug-in files.
 (let ((config-dir (concat minimal-emacs-user-directory ".config.d")))
   (if (not (file-exists-p config-dir))