Enable olivetti-mode in org-mode

init.el

@@ -1625,6 +1625,7 @@ successive invocations."
     (add-hook 'before-save-hook #'acdw-org/fix-blank-lines-in-buffer 0 :local))
 
   (:hook variable-pitch-mode
+         olivetti-mode
          acdw/org-fix-lines-before-save)
   
   (advice-add 'org-delete-backward-char

lisp/acdw-org.el

@@ -373,7 +373,7 @@ instead of the true count."
   (let ((point-target (if (> arg 0)
                           (point-max)
                         (point-min))))
-    (unless (or (org-next-visible-heading arg)
+    (unless (or (org-next-visible-heading arg) ; XXX: this doesn't work!!! ARGH 
                 (/= (point) point-target))
       (when (buffer-narrowed-p)
         (widen)