diff --git a/emacs/init.org b/emacs/init.org
index 2687290..14f16f7 100644
--- a/emacs/init.org
+++ b/emacs/init.org
@@ -1,19 +1,38 @@
 #+TITLE: Emacs init
-#+STYLE: <link href="http://ryuslash.ninth.su/test2.css" rel="stylesheet">
-#+OPTIONS: author:nil
+#+OPTIONS: author:nil num:nil
 #+STARTUP: showall
 #+LINK: yoshi-theme http://ryuslash.org/projects/yoshi-theme.html
 
-* gui
+* GUI
 
-  Remove the ~menu-bar~, ~tool-bar~ and ~scroll-bar~ from the UI since I
-  don't use them at all.
+  These things should happen early, so that Emacs will look the way I
+  want it to as quickly as is possible.
 
-  #+BEGIN_SRC emacs-lisp :tangle init2.el
-    (menu-bar-mode -1)
-    (scroll-bar-mode -1)
-    (tool-bar-mode -1)
-  #+END_SRC
+** menu-bar-mode
+
+   Disable =menu-bar-mode= since I haven't used the menu bar much ever,
+   even when I first started using Emacs.
+
+   #+BEGIN_SRC emacs-lisp :tangle init2.el
+     (menu-bar-mode -1)
+   #+END_SRC
+
+** scroll-bar-mode
+
+   Since Emacs gives a pretty good indication of where in the buffer
+   I'm working I really don't need to have the scroll bar visible.
+
+   #+BEGIN_SRC emacs-lisp :tangle init2.el
+     (scroll-bar-mode -1)
+   #+END_SRC
+
+** tool-bar-mode
+
+   I've never used the tool bar much, so remove it.
+
+   #+BEGIN_SRC emacs-lisp :tangle init2.el
+     (tool-bar-mode -1)
+   #+END_SRC
 
 * load-path
 
@@ -167,12 +186,18 @@
      (eval-after-load "flymake" '(oni:flymake-init))
    #+END_SRC
 
-   Disable the GUI for flymake errors, add a bunch of pep8, flymake
-   and pyflakes messages to warning and info patterns, set the log
-   file to somewhere in my home directory and set logging level to 0.
+   Disable the GUI for flymake errors. This causes the flymake errors
+   to be shown in the minibuffer.
 
    #+BEGIN_SRC emacs-lisp :tangle init2.el
      (setq flymake-gui-warnings-enabled nil)
+   #+END_SRC
+
+   Add a bunch of pep8, flymake and pyflakes messages to warning and
+   info patterns, set the log file to somewhere in my home directory
+   and set logging level to 0.
+
+   #+BEGIN_SRC emacs-lisp :tangle init2.el
      (setq flymake-info-line-regexp
            (eval-when-compile
              (regexp-opt