diff --git a/PresTeX/.gitignore b/PresTeX/.gitignore
index 220964c..37ee42e 100644
--- a/PresTeX/.gitignore
+++ b/PresTeX/.gitignore
@@ -25,3 +25,6 @@
 *.gin
 # Do not initialize twice
 .prepared
+presentation-blx.bib
+presentation.bcf
+presentation.run.xml
diff --git a/PresTeX/Makefile b/PresTeX/Makefile
index 7e2df52..56b679d 100644
--- a/PresTeX/Makefile
+++ b/PresTeX/Makefile
@@ -35,7 +35,7 @@ I =
 DOTTYPE := pdf
 LANG := de
 F :=
-DOT_WILDCARD := image/*.dot
+DOT_WILDCARD := images/*.dot
 .PHONY: fast latex bibtex dot spell spell1 todo
 fast:
 	pdflatex -synctex=1 -interaction=nonstopmode $(main)$(I)
@@ -45,6 +45,8 @@ latex:
 	pdflatex -synctex=1 -interaction=nonstopmode $(main)$(I)
 bibtex:
 	bibtex $(main)$(I)
+biber:
+	biber $(main)$(I)
 multibib:
     ifneq ("$(wildcard $(main)$(I)?.aux)", "")
 	@for i in $(main)$(I)?.aux; do bibtex $${i}; done;
diff --git a/PresTeX/images/oeb-ge.png b/PresTeX/images/oeb-ge.png
new file mode 100644
index 0000000..5b68472
Binary files /dev/null and b/PresTeX/images/oeb-ge.png differ
diff --git a/PresTeX/images/oeb-kml.png b/PresTeX/images/oeb-kml.png
new file mode 100644
index 0000000..3590410
Binary files /dev/null and b/PresTeX/images/oeb-kml.png differ
diff --git a/PresTeX/images/track-fi.png b/PresTeX/images/track-fi.png
new file mode 100644
index 0000000..5823591
Binary files /dev/null and b/PresTeX/images/track-fi.png differ
diff --git a/PresTeX/presentation.tex b/PresTeX/presentation.tex
index 5a4e570..046d7e3 100644
--- a/PresTeX/presentation.tex
+++ b/PresTeX/presentation.tex
@@ -5,6 +5,8 @@
 % Autor:    M.G.
 %===============================================================================
 
+%\newcommand*{\footcite}[1]{\footnote{\autocite{#1}}}
+
 \newcommand\ratio{169}
 \documentclass[10pt,aspectratio=\ratio,
 %draft,
@@ -31,6 +33,10 @@ compress
 \setbeamertemplate{caption}[numbered]
 %\numberwithin{figure}{section}
 
+
+ %\bibliographystyle{plain}
+ \bibliography{../ThesTeX/content/literature.bib}
+
 \begin{document}
   %===============================================================================
   % Zum Kompilieren latexmk ausführen.
@@ -88,25 +94,27 @@ compress
 %%%%%%%%%% Content starts here %%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\section{Ortsbezogene Spiele}
-\begin{frame}{Ortsbezogene Spiele}
+\section{Location based Games}
+\begin{frame}{Location based Games}
 \framesubtitle{Spass und Datenspuren}
 \begin{itemize}
 	\item Spielhandlungen an realen Orten verankert
 	\item 
 \end{itemize}
-TODO: cite \cite{Ahlqvist2018,1705427} %TODO
+TODO: cite \autocite{Ahlqvist2018}\autocite{1705427} %TODO
 \end{frame}
 
-\section{präzisierte problemstellung}
-\begin{frame}{präzisierte problemstellung}
+\section{Goal definition}
+\begin{frame}{Goal definition}
 \begin{itemize}
 	\item framework for analysis
-	\item expert users/researcher vs. staging/designing
+	\item 2 zielgruppen: expert users/researcher vs. staging/designing
 	\item integration von externen daten (fragebögen => CSV o.ä.)
 	\item adaptable for multiple games
 \end{itemize}
-components
+\end{frame}
+
+\begin{frame}{Components}
 \begin{itemize}
 	\item {\small(create + store game log)}
 	\item per-game importer
@@ -117,14 +125,14 @@ components
 \end{itemize}
 \end{frame}
 
-\section{forschungsstand}
+\section{State of research}
   \frame<handout:0>
   {
     \tableofcontents[sectionstyle=show/hide,hideothersubsections]
   }
 
-\subsection{logs}
-\begin{frame}{log processing}
+\subsection{Log processing}
+\begin{frame}{Log processing stacks}
 Technologies
 \begin{itemize}
 	\item ELK (Elastic search, Logstash, Kibana) -- Collectd, Influx DB, Grafana -- …
@@ -138,60 +146,66 @@ Technologies
 \end{itemize}
 TODO: bild mit importiertem GG2-logfile %TODO
 
-TODO: cite \cite{steinegger2016analyse,andreassen2015monitoring,yang2016aggregated,sanjappa2017analysis} %TODO
+TODO: cite \autocite{steinegger2016analyse}\autocite{andreassen2015monitoring}\autocite{yang2016aggregated}\autocite{sanjappa2017analysis} %TODO
 \end{frame}
 
-\subsection{fussgänger}
-\begin{frame}{fussgänger traces}
+\subsection{Pedestrian traces}
+\begin{frame}{Analyzing pedestrian movement}
 \begin{itemize}
 	\item 
 \end{itemize}
-TODO: cite \cite{ren2015mining,Ferrante_2016,Gong_2014,Ranacher_2015,van_der_Spek_2009,tourist_analysis2012} %TODO
+TODO: cite \autocite{ren2015mining}\autocite{Ferrante_2016}\autocite{Gong_2014}\autocite{Ranacher_2015}\autocite{van_der_Spek_2009}\autocite{tourist_analysis2012} %TODO
 \end{frame}
 
-\subsection{analyzing games}
-\begin{frame}{analyzing gamez}
+\subsection{Rendering GPS tracks}
+\begin{frame}{Render GPS}
+…
+\end{frame}
+
+\subsection{Analyzing games}
+\begin{frame}{Analyzing gamez}
 \begin{itemize}
 	\item there's more than heatmaps
 	\item combine position with game actions
 	\item identify patterns, balancing issues
-	\item manual processes \cite{Drachen2013,AHLQVIST20181}
+	\item manual processes %\citetitle{Drachen2013}\citetitle{AHLQVIST20181}
 \end{itemize}
 \vspace{-42pt}
-%\image{.5\textwidth}{game-an}{chat logs with players location \cite{Drachen2013}}{img:chatlogs}
-%\image{.5\textwidth}{ac3-death}{identify critical sections \cite{Drachen2013}}{img:ac3death}
-\twofigures{0.5}{game-an}{chat logs with players location \cite{Drachen2013}}{img:chatlogs}{ac3-death}{identify critical sections \cite{Drachen2013}}{img:ac3death}{game analytics}{fig:gameanal}
+%\image{.5\textwidth}{game-an}{chat logs with players location \autocite{Drachen2013}}{img:chatlogs}
+%\image{.5\textwidth}{ac3-death}{identify critical sections \autocite{Drachen2013}}{img:ac3death}
+\twofigures{0.5}{game-an}{chat logs with players location}{img:chatlogs}{ac3-death}{identify critical sections}{img:ac3death}{game analytics \cite{Drachen2013}}{fig:gameanal}
 \end{frame}
 
-\subsection{loc based games}
-\begin{frame}{analyzing location based games}
+\subsection{Location based games}
+\begin{frame}{Analyzing location based games}
 \begin{itemize}
 	\item fragebögen (prä + post; p-hacking)
 \end{itemize}
-TODO: cite \cite{Schaal2017} %TODO
+TODO: cite \footcite{Schaal2017} %TODO
 \end{frame}
 
-\subsection{summary}
-\begin{frame}{Zusammenfassung}
+\subsection{Summary}
+\begin{frame}{Summary}
 \begin{itemize}
 	\item log processing: doof
 	\item fussgänger-tracks auswerten: totgeschlagen (gps messfehler, muster, verhaltenserkennung, …)
+	\item track rendering: linie (mit attributen), raum-zeit-würfel, heatmap, …
 	\item räumliche auswertung von computerspielen: läuft
 	\item auswertung ortsbezogener spiele: macht niemand?
 \end{itemize}
 \end{frame}
 
-\section{lösungsansatz}
+\section{Solution approach}
   \frame<handout:0>
   {
     \tableofcontents[sectionstyle=show/hide,hideothersubsections]
   }
-\subsection{requirements}
-\begin{frame}{requirements}
+\subsection{Requirements}
+\begin{frame}{Requirements}
 …
 \end{frame}
-\subsection{ablauf}
-\begin{frame}{lösungsansatz}
+\subsection{Architecture}
+\begin{frame}{Solution approach}
 \begin{itemize}
 	\item map-reduce like
 	\item map: analyse-läufe
@@ -213,22 +227,23 @@ TODO: cite \cite{Schaal2017} %TODO
 \end{frame}
 
 
-\section{Ausblick: Umsetzung}
-\begin{frame}{Umsetzung}
-\framesubtitle{In Blau}
+\section{Outlook: Implementation}
+\begin{frame}{Implementation}
 \begin{itemize}
-	\item python (3)
+	\item python (3.6)
 	\item standalone library/cli tool
 	\item web based configuration/runner/API(flask)
 	\item …
 \end{itemize}
-%#1 Breite
-%#2 Datei (liegt im image Verzeichnis)
-%#3 Beschriftung
-%#4 Label fuer Referenzierung
-\image{.25\textwidth}{\meta/config/images/logo.png}{Uni-Logo}{img:logo}
 \end{frame}
 
+\begin{frame}{Configuration \& results}
+\twofigures{0.5}{oeb-kml}{Analyzer configuration}{img:oebkml}{oeb-ge}{Result visiualized}{img:oebge}{Example: Generate KML tracks (BioDiv2Go; Oberelsbach2016)}{fig:oeb2016}
+\end{frame}
+
+\begin{frame}{ActivityMapper}
+\image{.7\textwidth}{track-fi}{Combined screen activity and spatial progress}{img:trackfi}
+\end{frame}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -238,8 +253,7 @@ TODO: cite \cite{Schaal2017} %TODO
 \begin{frame}[allowframebreaks]{References}
  \def\newblock{\hskip .11em plus .33em minus .07em}
  \scriptsize
- \bibliographystyle{IEEEtran}
- \bibliography{../ThesTeX/content/literature.bib}
+ \printbibliography
  \normalsize
 \end{frame}
 
diff --git a/ThesTeX/content/3-solution.tex b/ThesTeX/content/3-solution.tex
index 65a8727..667e938 100644
--- a/ThesTeX/content/3-solution.tex
+++ b/ThesTeX/content/3-solution.tex
@@ -35,3 +35,23 @@
 	\item API for integration
 	\item allow load distribution
 \end{itemize}
+
+====
+\begin{itemize}
+	\item map-reduce like
+	\item map: analyse-läufe
+	\begin{itemize}
+		\item log-eintrags basiert
+		\item reichern log an
+		\item filtern log
+		\item metriken über komplette log => extern gespeichert
+		\item => evtl. Abhängigkeiten in Reihenfolge
+		\item basis-funktionalität || spiel-bezogen
+	\end{itemize}
+	\item reduce: Operieren mit Ergebnissen (über alle verarbeiteten logs hinweg)
+	\begin{itemize}
+		\item render
+		\item verteilung, …
+	\end{itemize}
+\end{itemize}
+
diff --git a/meta/config/packages.tex b/meta/config/packages.tex
index c438ac5..eea584b 100644
--- a/meta/config/packages.tex
+++ b/meta/config/packages.tex
@@ -3,12 +3,12 @@
 \usepackage[T1]{fontenc}
 \ifgit
 \ifpresentation
-  \usepackage[local]{gitinfo2}
+  \usepackage{gitinfo2}
   \else
   \ifthesis
-  \usepackage[local]{gitinfo2}
+  \usepackage{gitinfo2}
   \else
-  \usepackage[local,mark]{gitinfo2}
+  \usepackage[mark]{gitinfo2}
   \fi
 \fi
 \fi
@@ -30,7 +30,7 @@
 \usepackage[nice]{nicefrac}
 \usepackage{cancel}  %%druchstreichen von Formeln
 \usepackage{latexsym,marvosym,wasysym}
-\usepackage{ucs}
+%\usepackage{ucs}
 \usepackage{ltxtable}
 \usepackage{ragged2e}
 %%   Fuer anspruchsvolle Tabellen   %%
@@ -42,7 +42,11 @@
 \providecommand\phantomsection{}
 \usepackage{hyperref}
 \fi
-\usepackage[numbers]{natbib}
+\ifpresentation
+	\usepackage[style=authortitle-icomp,autocite=footnote]{biblatex}
+\else
+	\usepackage[numbers]{natbib}
+\fi
 \usepackage{lscape}
 \iftodo
 \usepackage{todonotes}