look ma, no pipes
Minor tweaks to main and makefile