Improve makefile and add output files