Clean up Makefile and output

I also fixed some targets. The output is nicer too :]