Worked a bit on the makefile