diff --git a/common/modules/swh-goals-oneslide-vertical.org b/common/modules/swh-goals-oneslide-vertical.org
index 173f1b9..3d27ff4 100644
--- a/common/modules/swh-goals-oneslide-vertical.org
+++ b/common/modules/swh-goals-oneslide-vertical.org
@@ -1,55 +1,55 @@
 #+COLUMNS: %40ITEM %10BEAMER_env(Env) %9BEAMER_envargs(Env Args) %10BEAMER_act(Act) %4BEAMER_col(Col) %10BEAMER_extra(Extra) %8BEAMER_opt(Opt)
 #
 # Software is all around us
 #
 #+INCLUDE: "prelude.org" :minlevel 1
 * How Software Heritage changes the world
   :PROPERTIES:
   :CUSTOM_ID: main
   :END:
 ** Software Heritage in a nutshell
   :PROPERTIES:
   :CUSTOM_ID: goals
   :END:
 #+latex: \begin{center}
 #+ATTR_LATEX: :width \extblockscale{.8\linewidth}
 file:SWH-logo+motto.pdf
 #+latex: \end{center}
 *** /Collect, preserve and share/ the /source code/ of /all the software/
     \hfill Preserving our heritage, enabling better software and better science for all
 #+BEAMER: \pause
 *** Reference catalog 
     :PROPERTIES:
     :BEAMER_env: block
     :BEAMER_COL: .3
     :END:
 #+BEGIN_EXPORT latex
 \begin{center}
 \includegraphics[width=.6\linewidth]{myriadsources}
 \end{center}
 #+END_EXPORT 
     find and reference *all* the source code
 #+BEAMER: \pause
 *** Universal archive
     :PROPERTIES:
     :BEAMER_env: block
     :BEAMER_COL: .3
     :END:
 #+BEGIN_EXPORT latex
 \begin{center}
 \includegraphics[width=.6\linewidth]{fragilecloud}
 \end{center}
 #+END_EXPORT 
     preserve *all* the source code
 #+BEAMER: \pause
-*** Research Infrastructure                                                             :B_block:
+*** Research infrastructure                                                             :B_block:
     :PROPERTIES:
     :BEAMER_COL: .3
     :BEAMER_env: block
     :END:
 #+BEGIN_EXPORT latex
 \begin{center}
 \includegraphics[width=.7\linewidth]{atacama-telescope}
 \end{center}
 #+END_EXPORT 
     enable analysis of *all* the source code
diff --git a/talks-public/2018-04-18-LLW/2018-04-18-LLW-lt.org b/talks-public/2018-04-18-LLW/2018-04-18-LLW-lt.org
index a83c943..e58f745 100644
--- a/talks-public/2018-04-18-LLW/2018-04-18-LLW-lt.org
+++ b/talks-public/2018-04-18-LLW/2018-04-18-LLW-lt.org
@@ -1,92 +1,66 @@
 #+COLUMNS: %40ITEM %10BEAMER_env(Env) %9BEAMER_envargs(Env Args) %10BEAMER_act(Act) %4BEAMER_col(Col) %10BEAMER_extra(Extra) %8BEAMER_opt(Opt)
-#+TITLE: Update on Software Heritage
+#+TITLE: Software Heritage: a Brief Update
 #+AUTHOR: Roberto Di Cosmo & Stefano Zacchiroli
 #+BEAMER_HEADER: \date[LLW 2018]{18 April 2018\\LLW\\Barcelona}
-#+DATE: 18 April 2018
+#+DATE: 20 April 2018
 
 #+INCLUDE: "../../common/modules/prelude.org"
 #+INCLUDE: "../../common/modules/169.org"
 
 #+BEAMER_HEADER: \institute[Software Heritage]{Software Heritage, roberto@dicosmo.org, zack@upsilon.cc}
-#+BEAMER_HEADER: \setbeamertemplate{background}{\includegraphics[width=\paperwidth,height=\paperheight]{world-169}}
-
-#+LATEX_HEADER_EXTRA: \usepackage{tikz}
-#+LATEX_HEADER_EXTRA: \usetikzlibrary{arrows,shapes}
-#+LATEX_HEADER_EXTRA: \definecolor{swh-orange}{RGB}{254,205,27}
-#+LATEX_HEADER_EXTRA: \definecolor{swh-red}{RGB}{226,0,38}
-#+LATEX_HEADER_EXTRA: \definecolor{swh-green}{RGB}{77,181,174}
-#
-# to have a toc for each section
-#
-# Use suggestions from http://web.stanford.edu/~dgleich/notebook/2009/05/appendix_slides_in_beamer_cont_1.html to avoid counting tocs in page number
-#
-#+latex_header: \AtBeginSection[] {\begin{frame}<*> \frametitle{Outline} \tableofcontents[currentsection]\end{frame} \addtocounter{framenumber}{-1}}
 
 * Software Heritage
-#+INCLUDE: "../../common/modules/swh-goals-oneslide-vertical.org::#goals" :minlevel 2
-#
-** The Software Heritage Project \hfill www.softwareheritage.org   :noexport:
-  :PROPERTIES:
-  :CUSTOM_ID: mission
-  :END:
-#+latex: \begin{center}
-#+ATTR_LATEX: :width .8\linewidth
-# file:SWH-logo+motto.pdf
-file:SWH-logo.pdf
-#+latex: \end{center}
-*** Our mission
-      *Collect*, *preserve* and *share* the /source code/ of /all the software/\\
-\mbox{}\\
-     \hfill /Preserving/ the past, /enhancing/ the present, /preparing/ the future
-** Growing Support
+  #+INCLUDE: "../../common/modules/swh-goals-oneslide-vertical.org::#goals" :minlevel 2
+** Architecture (simplified)                                       :noexport:
+    #+BEAMER: \begin{center}
+    #+BEAMER:   \mode<beamer>{\only<1>{\includegraphics[width=\extblockscale{.9\textwidth}]{swh-dataflow-merkle-listers.pdf}}}
+    #+BEAMER:   \only<2-3>{\includegraphics[width=\extblockscale{.9\textwidth}]{swh-dataflow-merkle.pdf}}
+    #+BEAMER: \end{center}
+#+BEAMER: \pause
+#+BEAMER: \pause
+   - crawling + normalizing
+   - full development history permanently archived
+   - origins: GitHub (automated), Debian (automated), Gitorious, Google Code, GNU
+   - ~150Tb raw contents, ~10Tb graph (7+Bn nodes, 60+Bn edges)
+  #+INCLUDE: "../../common/modules/status-extended.org::#dataflow" :minlevel 2
+  #+INCLUDE: "../../common/modules/status-extended.org::#archive" :minlevel 2
+** News
+*** Features
+    - direct deposit (use case: complete & corresponding source)
+    - batch download
+    - archive browsing / way back machine
+      https://archive.softwareheritage.org \\
+      username/pwd: fosdem/2018
+*** Institutional
+    Software Heritage Foundation
+    - public charity
+    - being created right now (ETA: weeks)
+** Growing support
   :PROPERTIES:
   :CUSTOM_ID: support
   :END:
 *** Landmark Inria Unesco agreement, April 3rd, 2017
  #+BEGIN_EXPORT latex
     \includegraphics[width=\extblockscale{.25\linewidth}]{inria-logo-new} \hfill
     \includegraphics[width=\extblockscale{.35\linewidth}]{unesco-accord} \hfill
     \includegraphics[width=\extblockscale{.2\linewidth}]{unesco}\\[1em]
  #+END_EXPORT
 *** Sharing the vision                                              :B_block:
   :PROPERTIES:
   :CUSTOM_ID: endorsement
   :BEAMER_COL: .5
   :BEAMER_env: block
   :END:
    #+LATEX: \begin{center}\includegraphics[width=\extblockscale{1.4\linewidth}]{support.pdf}\end{center}
-*** See more                                                       :noexport:
-    \hfill\tiny\url{http:://www.softwareheritage.org/support/testimonials}
 *** Contributing to the mission                                     :B_block:
     :PROPERTIES:
     :CUSTOM_ID: sponsors
     :BEAMER_COL: .5
     :BEAMER_env: block
     :END:
     #+LATEX: \begin{center}\includegraphics[width=\extblockscale{.4\linewidth}]{inria-logo-new}\end{center}
    #+LATEX: \begin{center}
    #+LATEX: \includegraphics[width=\extblockscale{.2\linewidth}]{sponsors-levels.pdf}
    #+LATEX: \includegraphics[width=\extblockscale{1.1\linewidth}]{sponsors.pdf}
    #+LATEX: \end{center}
 #   - sponsoring / partnership :: \hfill \url{sponsorship.softwareheritage.org}
-** Architecture (simplified)
-    #+BEAMER: \begin{center}
-    #+BEAMER:   \mode<beamer>{\only<1>{\includegraphics[width=\extblockscale{.9\textwidth}]{swh-dataflow-merkle-listers.pdf}}}
-    #+BEAMER:   \only<2-3>{\includegraphics[width=\extblockscale{.9\textwidth}]{swh-dataflow-merkle.pdf}}
-    #+BEAMER: \end{center}
-#+BEAMER: \pause
-#+BEAMER: \pause
-   - crawling + normalizing
-   - full development history permanently archived
-   - origins: GitHub (automated), Debian (automated), Gitorious, Google Code, GNU
-   - ~150Tb raw contents, ~10Tb graph (7+Bn nodes, 60+Bn edges)
-** News
-*** institutional
-    Software Heritage Foundation
-    - being created right now
-*** features are coming
-    See archive.softwareheritage.org (*fosdem* / *2018*)
-    - browse
-    - dowload
-*** come and learn more
-    - Room 11,