diff --git a/core/core-editor.el b/core/core-editor.el
index 55d153b09..9aabd3a64 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -10,6 +10,10 @@
  require-final-newline   t
  delete-trailing-lines   nil
  fill-column             80
+ word-wrap t
+ truncate-lines                  t
+ truncate-partial-width-windows  50
+ line-spacing 0
 
  ;; Sane scroll settings
  scroll-margin           0
@@ -24,9 +28,7 @@
  whitespace-style '(face tabs tab-mark newline newline-mark)
  whitespace-display-mappings
  '((tab-mark   ?\t   [?> ?\t])
-   (newline-mark 10 [36 10]))
- truncate-lines                  t      ; do not soft-wrap lines
- truncate-partial-width-windows  nil)
+   (newline-mark 10 [36 10])))
 
 
 ;; Automatic minor modes ;;;;;;;;;;;
diff --git a/core/core.el b/core/core.el
index ff6a70592..58e24cc83 100644
--- a/core/core.el
+++ b/core/core.el
@@ -112,6 +112,21 @@
       recentf-auto-cleanup 600)
 (recentf-mode 1)
 
+(use-package persistent-soft
+  :commands (persistent-soft-store
+             persistent-soft-fetch
+             persistent-soft-exists-p
+             persistent-soft-flush
+             persistent-soft-location-readable
+             persistent-soft-location-destroy))
+
+(use-package async
+  :commands (async-start
+             async-start-process
+             async-get
+             async-wait
+             async-inject-variables))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defun narf-init ()
@@ -120,11 +135,20 @@
     (cl-flet ((process-list ())) ad-do-it))
 
   (defun display-startup-echo-area-message ()
-    (message ">>> Loaded in %s" (emacs-init-time)))
+    (after! workgroups2
+      (let ((wg-list (if (wg-current-session t)
+                         (wg-display-internal
+                          (lambda (workgroup index)
+                            (if (not workgroup) wg-nowg-string
+                              (wg-element-display
+                               workgroup
+                               (format "%d %s" (1+ index) (wg-workgroup-name workgroup))
+                               'wg-current-workgroup-p
+                               'wg-previous-workgroup-p)))
+                          (wg-workgroup-list)) "")))
+        (message ">>> Loaded in %s. %s" (emacs-init-time) wg-list))))
 
-  (require 'server)
-  (unless (server-running-p)
-    (server-start)))
+  (add-hook 'after-init-hook 'server-start t))
 
 (provide 'core)
 ;;; core.el ends here