diff --git a/global.org b/global.org
index ca7bd94..c3c5e74 100644
--- a/global.org
+++ b/global.org
@@ -351,36 +351,59 @@
 * Main major modes
 ** org-mode
 *** Require
+    Require the ~org~ package; I also occasionally use org-pomodoro
     #+BEGIN_SRC emacs-lisp
      (require 'org)
      (require 'org-pomodoro)
     #+END_SRC
 *** Hooks
+    Enable ~auto-fill-mode~ (see
+    [https://www.gnu.org/software/emacs/manual/html_node/emacs/Auto-Fill.html])
+    honestly I do not see where I would not want to use this.
     #+BEGIN_SRC emacs-lisp
       (add-hook 'org-mode-hook (lambda ()
 			     (turn-on-auto-fill)))
     #+END_SRC
 *** Agenda
+    Set the canonical binding for the agenda
     #+BEGIN_SRC emacs-lisp
      (global-set-key (kbd "C-c a") 'org-agenda)
-     (setq org-agenda-files
-     ' ("~/org/notes.org" "~/org/orgzly/work.org" "~/org/orgzly/hack.org" "~/org/orgzly/live.org" "~/org/orgzly/refile.org"))
-     (setq org-agenda-span 1)
-     (setq org-agenda-custom-commands
-		'(("h" "Agenda and Android tasks"
-		   ((agenda "")
-		    (tags-todo "Android")))
-		  ("a" "Main agenda"
-		   ((agenda "")
-		    (todo "NEXT|ONGOING")
-		    (tags-todo "hack")
-		    (tags-todo "5m")
-		    (todo "TODO")))
-		  ("5" "Agenda and Break tasks"
-		   ((agenda "")
-		    (tags-todo "5m")
-		    (tags-todo "20m")))))
-     #+END_SRC
+    #+END_SRC
+    Define agenda files: the main one is ~notes.org~, but then I have a bunch
+    of them on orgzly
+    #+BEGIN_SRC emacs-lisp
+      (setq org-agenda-files
+      '("~/org/notes.org"
+        "~/org/orgzly/work.org"
+        "~/org/orgzly/hack.org"
+        "~/org/orgzly/live.org"
+        "~/org/orgzly/refile.org"))
+    #+END_SRC
+    Default to daily agenda
+    #+BEGIN_SRC emacs-lisp
+      (setq org-agenda-span 1)
+    #+END_SRC
+    Ideally I should tag some tasks as “break” tasks, which are suitable to be
+    taken care of during a pomodoro break.  Such tasks should be marked with
+    tags ~:5m:~ and ~:20m:~ according to the estimate on the time it would take to
+    take care of them
+    #+BEGIN_SRC emacs-lisp
+      (setq org-agenda-custom-commands
+      '(
+      ("a" "Main agenda"
+      ((agenda "")
+      (todo "NEXT|ONGOING")
+      (tags-todo "hack")
+      (tags-todo "5m")
+      (todo "TODO")))
+      ("h" "Agenda and Android tasks"
+      ((agenda "")
+      (tags-todo "Android")))
+      ("5" "Agenda and Break tasks"
+      ((agenda "")
+      (tags-todo "5m")
+      (tags-todo "20m")))))
+    #+END_SRC
 *** Capture
      #+BEGIN_SRC emacs-lisp
      (setq org-default-notes-file "~/org/notes.org")