diff --git a/core/autoload/popups.el b/core/autoload/popups.el
index 0c6073ec0..3a7f4c9c3 100644
--- a/core/autoload/popups.el
+++ b/core/autoload/popups.el
@@ -18,7 +18,7 @@ current window if omitted."
   (declare (indent defun))
   (unless (bufferp buffer)
     (error "%s is not a valid buffer" buffer))
-  (setq plist (doom*shackle-always-align plist))
+  (setq plist (append plist (shackle-match buffer)))
   (shackle-display-buffer
    buffer
    nil (or plist (shackle-match buffer))))
diff --git a/core/core-popups.el b/core/core-popups.el
index 4f9dfdcfe..de2af9918 100644
--- a/core/core-popups.el
+++ b/core/core-popups.el
@@ -197,8 +197,7 @@ and setting `doom-popup-rules' within it. Returns the window."
     (when (get-buffer-window-list (car args) nil t)
       (setq plist (append (list :autokill t) plist))
       (setcar args (clone-indirect-buffer (buffer-name (car args)) nil t)))
-    (setq window (apply orig-fn args))
-    (unless window
+    (unless (setq window (apply orig-fn args))
       (error "No popup window was found for %s: %s" (car args) plist))
     (with-selected-window window
       (unless (eq plist t)
diff --git a/init.example.el b/init.example.el
index 5a40c722b..d98632cf3 100644
--- a/init.example.el
+++ b/init.example.el
@@ -43,10 +43,10 @@
 
        :completion
        company         ; auto-completion backend
-       ;; TODO auto-complete   ; auto-completion backend #2
+       ;; TODO auto-complete
        ivy             ; a search engine for love and life
-       ;; helm            ;
-       ;; ido             ;
+       ;; helm
+       ;; ido
 
        :ui
        doom            ; doom-one; a look inspired by Atom's Dark One
diff --git a/modules/feature/eval/autoload/build.el b/modules/feature/eval/autoload/build.el
index c46ac9ed4..b084dadac 100644
--- a/modules/feature/eval/autoload/build.el
+++ b/modules/feature/eval/autoload/build.el
@@ -29,6 +29,7 @@ functions.")
 
 ;;;###autoload
 (defun +eval/build (builder)
+  "TODO"
   (interactive
    (list (or +eval-last-builder
              (+eval--read-builder)
diff --git a/modules/feature/eval/config.el b/modules/feature/eval/config.el
index 7c17884e4..b25af86dd 100644
--- a/modules/feature/eval/config.el
+++ b/modules/feature/eval/config.el
@@ -1,9 +1,5 @@
 ;;; feature/eval/config.el
 
-;; This module creates a centralized way of invoking/sending selections to REPLs
-;; (with `repl-toggle'), building projects/files, and running code (with
-;; `quickrun'), revealing its output in a popup window.
-
 ;;
 ;; Code building
 ;;