diff --git a/.gitignore b/.gitignore
index efe652b..fe72bc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,17 +10,19 @@
 /*.out
 /*.toc
 /*.pdf
-/bibexport.bib
-/die.tar.gz
 /rev.tex
+*.synctex.gz
 /abstract.txt
 /code/*.tex
 !/code/fmt.tex
-!/figs/*.pdf
-!/figs/*.eps
-!/data/*.pdf
-!/data/*.eps
+!/fig/*.pdf
+!/fig/*.eps
+/data/*.pdf
+/data/*.eps
+/data/*.tex
 .latexrun.db
-/_minted-p/
-/p.synctex.gz
 /auto
+/Users
+.vscode/
+*.swp
+diff.tex
diff --git a/Makefile b/Makefile
index 99662d1..94c59c5 100644
--- a/Makefile
+++ b/Makefile
@@ -50,11 +50,11 @@ data/%.pdf: data/%.py ## generate plot
 
 draft: $(DEPS) ## generate pdf with a draft info
 	echo -e '\\newcommand*{\\DRAFT}{}' >> rev.tex
-	@TEXINPUTS="sty:" bin/latexrun $(BTEX) $(MAIN)
+	@TEXINPUTS="sty:" bin/latexrun $(LTEX) $(BTEX) $(MAIN)
 
 watermark: $(DEPS) ## generate pdf with a watermark
 	echo -e '\\usepackage[firstpage]{draftwatermark}' >> rev.tex
-	@TEXINPUTS="sty:" bin/latexrun $(BTEX) $(MAIN)
+	@TEXINPUTS="sty:" bin/latexrun $(LTEX) $(BTEX) $(MAIN)
 
 spell: ## run a spell check
 	@for i in *.tex fig/*.tex; do bin/aspell.sh tex $$i; done
diff --git a/bin/latexrun b/bin/latexrun
index 1938e98..77801a3 100755
--- a/bin/latexrun
+++ b/bin/latexrun
@@ -1217,7 +1217,7 @@ class LaTeXFilter:
                 return self.__runaway()
             if lookingatre(r'(Overfull|Underfull|Loose|Tight) \\[hv]box \('):
                 return self.__bad_box()
-            if lookingatre('(Package |Class |LaTeX |pdfTeX )?(\w+ )?warning: ', re.I):
+            if lookingatre(r'(Package |Class |LaTeX |pdfTeX )?(\w+ )?warning: ', re.I):
                 return self.__generic_warning()
             if lookingatre('No file .*\\.tex\\.$', re.M):
                 # This happens with \includes of missing files.  For
@@ -1357,7 +1357,7 @@ class LaTeXFilter:
         stack = []
         while self.__avail:
             m1 = self.__lookingatre(r'<([a-z ]+|\*|read [^ >]*)> |\\.*(->|...)')
-            m2 = self.__lookingatre('l\.[0-9]+ ')
+            m2 = self.__lookingatre(r'l\.[0-9]+ ')
             if m1:
                 found_context = True
                 pre = self.__consume_line().rstrip('\n')
@@ -1840,7 +1840,7 @@ class BibTeXFilter:
             return ('warning', None, None, m.group(1))
 
         if match('^.*> ERROR - (.*)$'):
-            m2 = re.match("BibTeX subsystem: (.*?), line (\d+), (.*)$", m.group(1))
+            m2 = re.match(r"BibTeX subsystem: (.*?), line (\d+), (.*)$", m.group(1))
             if m2:
                 return ('error', m2.group(1), m2.group(2), m2.group(3))
             return ('error', None, None, m.group(1))
diff --git a/p.tex b/p.tex
index 179a187..6ecf12c 100644
--- a/p.tex
+++ b/p.tex
@@ -5,7 +5,7 @@
 \usepackage[square,comma,numbers,sort&compress]{natbib}
 
 % common packages
-\include{pkgs}
+\input{pkgs}
 
 \newcommand{\sys}{\mbox{\textsc{Die}}\xspace}
 
diff --git a/pkgs.tex b/pkgs.tex
index bf362c7..f661f97 100644
--- a/pkgs.tex
+++ b/pkgs.tex
@@ -2,10 +2,10 @@
 
 \usepackage[hyphens]{url}
 \usepackage[breaklinks,colorlinks]{hyperref}
-\usepackage[usenames,dvipsnames]{xcolor}
+\usepackage[dvipsnames]{xcolor}
 \hypersetup{citecolor=blue,linkcolor=blue}
 \usepackage{amsmath,amsopn,amssymb}
-\usepackage{subfigure}
+%\usepackage{subfigure}
 \usepackage{endnotes,microtype,xspace,graphicx,fancyvrb,multirow}
 \usepackage{booktabs}
 \usepackage{array,underscore,relsize}
@@ -13,7 +13,7 @@
 \usepackage{times}
 \usepackage{fancyhdr,lastpage}
 \usepackage{enumitem}
-\usepackage[labelfont=bf,font=small,skip=5pt]{caption}
+%\usepackage[labelfont=bf,font=small,skip=5pt]{caption}
 \pagestyle{fancy}
 \fancyhf{}
 \renewcommand{\headrulewidth}{0pt}
@@ -24,6 +24,10 @@
 \usepackage{siunitx}
 
 % pseudo code
+\makeatletter
+\@namedef{ver@lineno.sty}{9999/12/31}
+\@namedef{opt@lineno.sty}{}
+\makeatother
 \usepackage{minted}
 
 % balance bibliography