Tweak Makefile for consistency and Ctrl+C-ability