Cleaned up makefile and argument parsing.