Merge?

config.org

@@ -193,7 +193,7 @@ I use BibLaTeX for better compatibility with accented characters and generally b
 
 ** =calibredb=
 
-This may work only on Linux (it uses SQL???, but my ebooks are only on Linux so that’s ok.
+This may work only on Linux (it uses SQL???), but my ebooks are only on Linux so that’s ok.
 
 #+BEGIN_SRC emacs-lisp
   (when (islin)
@@ -216,7 +216,6 @@ Let me search my journal files, not synced to my work computer. Stupid regexp fo
 #+BEGIN_SRC emacs-lisp
   (unless (atwork)
     (use-package deft
-      ;; for searching journal files
       :config
       (setq deft-extensions '("org"))
       (setq deft-directory "~/Documents/drive/org/journal")
@@ -386,7 +385,6 @@ Show a nice filetree with icons. I use this much less often than I should.
 
 #+BEGIN_SRC emacs-lisp
   (use-package neotree
-    ;; show filetree
     :init
     (global-set-key [f8] 'neotree-toggle)
     :config
@@ -467,7 +465,6 @@ Let properties be inherited by subheadings. I use this a lot for =:LOCATION:= on
 
 #+BEGIN_SRC emacs-lisp
   (use-package org-agenda-property)
-  ;; lets properties inherit
 #+END_SRC
 
 **** =org-journal=
@@ -651,7 +648,6 @@ As previously described, “the big boy”. I know little about most of these se
 
 #+BEGIN_SRC emacs-lisp
   (use-package tex
-    ;; the big boy
     :ensure auctex
     :mode ("\\.tex\\'" . latex-mode)
     :init
@@ -674,7 +670,6 @@ Automatically use smart quotes in text modes. (This was set up with =org-mode-ho
 
 #+BEGIN_SRC emacs-lisp
   (use-package typo
-    ;; smart quotes
     :custom
     (typo-global-mode 1)
     :init