diff --git a/.gitignore b/.gitignore
index 2da7e9b..4c34030 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,6 @@ lexer.c
 *.zip
 
 # redundant files
-*_old.*
\ No newline at end of file
+*_old.*
+
+tex_build/../15_*.pdf
\ No newline at end of file
diff --git a/recursive-dissent_A2.c b/15_A2.c
similarity index 100%
rename from recursive-dissent_A2.c
rename to 15_A2.c
diff --git a/recursive-dissent_A2.l b/15_A2.l
similarity index 100%
rename from recursive-dissent_A2.l
rename to 15_A2.l
diff --git a/recursive-dissent_A2.nc b/15_A2.nc
similarity index 100%
rename from recursive-dissent_A2.nc
rename to 15_A2.nc
diff --git a/recursive-dissent_A2.tex b/15_A2.tex
similarity index 100%
rename from recursive-dissent_A2.tex
rename to 15_A2.tex
diff --git a/Makefile b/Makefile
index 0364350..5bd5eac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,16 @@
 CC=gcc
 l=flex
+CFLAGS=-Wall -Wextra -Werror -pedantic -std=c11
 
 o=lexer
 
-team=recursive-dissent
+team=15
 assignment=2
 
 build: clean $(o)
 
 $(o): $(o).c
-	$(CC) -o $(o) $^ $(team)_A$(assignment).c
+	$(CC) $(CFLAGS) -o $(o) $^ $(team)_A$(assignment).c
 
 $(o).c: $(team)_A$(assignment).l
 	$(l) -o$(o).c $^
diff --git a/expected.out b/expected.out
index 0cf4a9e..af45aed 100644
--- a/expected.out
+++ b/expected.out
@@ -1 +1 @@
-<KEYWORD, int>, <IDENT, a>, <PUNCT, =>, <CONST, 341>, <PUNCT, ;>, <KEYWORD, int>, <IDENT, b>, <PUNCT, =>, <CONST, 0213>, <PUNCT, ;>, <KEYWORD, int>, <IDENT, c>, <PUNCT, =>, <CONST, -123>, <PUNCT, ;>, <KEYWORD, int>, <IDENT, d>, <PUNCT, =>, <PUNCT, ->, <CONST, 00045>, <PUNCT, ;>, <KEYWORD, int>, <IDENT, _valididentifier_>, <PUNCT, =>, <CONST, +1>, <PUNCT, ;>, <KEYWORD, int>, <PUNCT, *>, <IDENT, ptr>, <PUNCT, =>, <PUNCT, &>, <IDENT, d>, <PUNCT, ;>, <KEYWORD, int>, <PUNCT, *>, <IDENT, ptrptr>, <PUNCT, =>, <PUNCT, &>, <IDENT, ptr>, <PUNCT, ;>, <PUNCT, *>, <PUNCT, *>, <IDENT, ptr>, <PUNCT, +>, <PUNCT, +>, <PUNCT, ;>, <IDENT, ptr>, <PUNCT, ->>, <IDENT, addr>, <PUNCT, (>, <PUNCT, )>, <PUNCT, ;>, <KEYWORD, if>, <PUNCT, (>, <IDENT, name1>, <PUNCT, ==>, <STRLIT, "3454\n">, <PUNCT, )>, <PUNCT, {>, <KEYWORD, return>, <CONST, 'abc'>, <PUNCT, ;>, <PUNCT, }>, <KEYWORD, void>, <IDENT, identifierguy>, <PUNCT, (>, <KEYWORD, int>, <IDENT, x>, <PUNCT, =>, <CONST, -31>, <PUNCT, )>, <PUNCT, {>, <KEYWORD, if>, <PUNCT, (>, <IDENT, x>, <PUNCT, ==>, <CONST, -31>, <PUNCT, )>, <PUNCT, {>, <KEYWORD, return>, <PUNCT, ;>, <PUNCT, }>, <KEYWORD, else>, <PUNCT, {>, <KEYWORD, for>, <PUNCT, (>, <PUNCT, ;>, <PUNCT, ;>, <PUNCT, )>, <PUNCT, {>, <IDENT, printf>, <PUNCT, (>, <STRLIT, "aaaaaaaaaaaaaaaaaaaaa">, <PUNCT, )>, <PUNCT, ;>, <PUNCT, }>, <PUNCT, }>, <PUNCT, }>, <STRLIT, "weirdo stringliteral /*hopefully not a comment*/ \n \n \n \n ">, <CONST, 1>, <PUNCT, *>, <PUNCT, />, <IDENT, asdipoi>, <IDENT, a>, <IDENT, works>, <IDENT, hopefully>, <IDENT, these>, <IDENT, are>, <IDENT, idents>, <PUNCT, *>, <PUNCT, />, <STRLIT, "string literal">, <IDENT, not>, <IDENT, anymore>, 
+<KEYWORD, int>, <IDENT, a>, <PUNCT, =>, <CONST, 341>, <PUNCT, ;>, <KEYWORD, int>, <IDENT, b>, <PUNCT, =>, <CONST, 0213>, <PUNCT, ;>, <KEYWORD, int>, <IDENT, c>, <PUNCT, =>, <CONST, -123>, <PUNCT, ;>, <KEYWORD, int>, <IDENT, d>, <PUNCT, =>, <PUNCT, ->, <CONST, 00045>, <PUNCT, ;>, <KEYWORD, int>, <IDENT, _valididentifier_>, <PUNCT, =>, <CONST, +1>, <PUNCT, ;>, <IDENT, swap>, <IDENT, top>, <KEYWORD, int>, <PUNCT, *>, <IDENT, ptr>, <PUNCT, =>, <PUNCT, &>, <IDENT, d>, <PUNCT, ;>, <KEYWORD, int>, <PUNCT, *>, <IDENT, ptrptr>, <PUNCT, =>, <PUNCT, &>, <IDENT, ptr>, <PUNCT, ;>, <PUNCT, *>, <PUNCT, *>, <IDENT, ptr>, <PUNCT, +>, <PUNCT, +>, <PUNCT, ;>, <IDENT, ptr>, <PUNCT, ->>, <IDENT, addr>, <PUNCT, (>, <PUNCT, )>, <PUNCT, ;>, <KEYWORD, if>, <PUNCT, (>, <IDENT, name1>, <PUNCT, ==>, <STRLIT, "3454\n">, <PUNCT, )>, <PUNCT, {>, <KEYWORD, return>, <CONST, 'abc'>, <PUNCT, ;>, <PUNCT, }>, <KEYWORD, void>, <IDENT, identifierguy>, <PUNCT, (>, <KEYWORD, int>, <IDENT, x>, <PUNCT, =>, <CONST, -31>, <PUNCT, )>, <PUNCT, {>, <KEYWORD, if>, <PUNCT, (>, <IDENT, x>, <PUNCT, ==>, <CONST, -31>, <PUNCT, )>, <PUNCT, {>, <KEYWORD, return>, <PUNCT, ;>, <PUNCT, }>, <KEYWORD, else>, <PUNCT, {>, <KEYWORD, for>, <PUNCT, (>, <PUNCT, ;>, <PUNCT, ;>, <PUNCT, )>, <PUNCT, {>, <IDENT, printf>, <PUNCT, (>, <STRLIT, "aaaaaaaaaaaaaaaaaaaaa">, <PUNCT, )>, <PUNCT, ;>, <PUNCT, }>, <PUNCT, }>, <PUNCT, }>, <STRLIT, "weirdo stringliteral /*hopefully not a comment*/ \n \n \n \n ">, <CONST, 1>, <PUNCT, *>, <PUNCT, />, <IDENT, asdipoi>, <IDENT, a>, <IDENT, works>, <IDENT, hopefully>, <IDENT, these>, <IDENT, are>, <IDENT, idents>, <PUNCT, *>, <PUNCT, />, <STRLIT, "string literal">, <IDENT, not>, <IDENT, anymore>, 
diff --git a/recursive-dissent_A2.pdf b/tex_build/15_A2.pdf
similarity index 99%
rename from recursive-dissent_A2.pdf
rename to tex_build/15_A2.pdf
index a323de1..9598e9c 100644
Binary files a/recursive-dissent_A2.pdf and b/tex_build/15_A2.pdf differ
diff --git a/tex_build/recursive-dissent_A2.pdf b/tex_build/recursive-dissent_A2.pdf
deleted file mode 100644
index a323de1..0000000
Binary files a/tex_build/recursive-dissent_A2.pdf and /dev/null differ