Update Makefile, fix line lengths, and a few other formatting tweaks.