Add a set of alternate output
Clean up makefile