diff --git a/.emacs.d/lisp/init-eshell.el b/.emacs.d/lisp/init-eshell.el
index d76b7bf7..49283983 100644
--- a/.emacs.d/lisp/init-eshell.el
+++ b/.emacs.d/lisp/init-eshell.el
@@ -44,6 +44,28 @@
 
 ;;; REVIEW: 40M+ output: Stack overflow in regexp matcher
 ;;; See bug#28329.
+;;; I guess the chunking is significant too.  Could you try saving
+;;; the output chunks, with this:
+;;
+;; (defvar eshell-chunk-number 0)
+;; (defconst eshell-output-chunk-dir "eshell-output")
+;; (make-directory eshell-output-chunk-dir t)
+;;
+;; (defun catch-eshell-output-chunk ()
+;;   (write-region eshell-last-output-block-begin
+;;                 eshell-last-output-end
+;;                 (format "%s/chunk.%d"
+;;                         eshell-output-chunk-dir
+;;                         eshell-chunk-number)
+;;                 nil :quiet)
+;;   (setq eshell-chunk-number (1+ eshell-chunk-number)))
+;;
+;; (add-hook 'eshell-output-filter-functions
+;;           'catch-eshell-output-chunk)
+;;;
+;;; And then afterwards 'cat eshell-output/chunk.*' should hopefully
+;;; reproduce it?
+
 
 ;;; REVIEW: Eshell mixes stderr and stdout it seems.
 ;;; Example:
diff --git a/.emacs.d/lisp/init-exwm.el b/.emacs.d/lisp/init-exwm.el
index 3ed11f14..c30f8125 100644
--- a/.emacs.d/lisp/init-exwm.el
+++ b/.emacs.d/lisp/init-exwm.el
@@ -15,14 +15,13 @@
 ;;; TODO: Pressing "s-a" ('emms-smart-browse) loses the cursor.
 ;;; Sometimes waiting helps.  Calling emms-smart-browse manually does not trigger the issue.
 ;;; TODO: Spawn select programs in floating mode? (E.g. mpv, mupen64plus, mplayer, qemu, steam, .exe (wine).)
-;;; TODO: Separate EXWM buffers and Emacs buffers in `helm-mini'?
 
 ;;; TODO: Rendering issue with Qutebrowser
 ;;; Sometimes need to change window configuration
 ;;; https://github.com/ch11ng/exwm/issues/300
 ;;; Step to reproduce EXWM freeze
 
-;;; TODO: helm-mini with follow-mode hangs when using EXWM.
+;;; REVIEW: helm-mini with follow-mode hangs when using EXWM.
 ;;; https://github.com/emacs-helm/helm/issues/1889
 
 ;;; Rename buffer to window title.
diff --git a/.emacs.d/lisp/main.el b/.emacs.d/lisp/main.el
index 2230a0ca..bea9cd41 100644
--- a/.emacs.d/lisp/main.el
+++ b/.emacs.d/lisp/main.el
@@ -246,7 +246,8 @@
 ;;; See https://groups.google.com/forum/#!topic/gnu.emacs.help/64aO_O43530
 ;;; and https://www.reddit.com/r/emacs/comments/4q38s1/save_register_between_sessions/?st=j419vc7r&sh=2617ffb4
 ;;; and http://debbugs.gnu.org/cgi/bugreport.cgi?bug=27422
-;;; and https://stackoverflow.com/questions/5830494/windows-configuration-to-registers#5830928.
+;;; and https://stackoverflow.com/questions/5830494/windows-configuration-to-registers#5830928
+;;; and https://www.reddit.com/r/emacs/comments/7au3hj/how_do_you_manage_your_emacs_windows_and_stay_sane/dpfbg3a/?context=3.
 (defadvice desktop-owner (after pry-from-cold-dead-hands activate)
   "Don't allow dead emacsen to own the desktop file."
   (when (not (emacs-process-p ad-return-value))
diff --git a/.emacs.d/lisp/patch-desktop.el b/.emacs.d/lisp/patch-desktop.el
index 5312ea14..e2e1f141 100644
--- a/.emacs.d/lisp/patch-desktop.el
+++ b/.emacs.d/lisp/patch-desktop.el
@@ -59,6 +59,7 @@ Using it may cause conflicts.  Use it anyway? " owner)))))
             ;; disabled when loading the desktop fails with errors,
             ;; thus not overwriting the desktop with broken contents.
             (setq desktop-autosave-was-enabled
+                  ;; PATCH
                   (memq 'desktop-auto-save-set-timer (default-toplevel-value 'window-configuration-change-hook)))
             (desktop-auto-save-disable)
             ;; Evaluate desktop buffer and remember when it was modified.