added rudimentary commandline args, cleanup makefile