updated Makefile, fmt'd