Merge and updates to Makefile.